Hello community,
here is the log from the commit of package kdewebdev3 for openSUSE:Factory
checked in at 2013-02-18 13:46:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdewebdev3 (Old)
and /work/SRC/openSUSE:Factory/.kdewebdev3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdewebdev3", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdewebdev3/kdewebdev3.changes 2012-05-22
08:16:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdewebdev3.new/kdewebdev3.changes
2013-02-18 13:46:58.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 18 04:42:39 UTC 2013 - an...@opensuse.org
+
+- disable kxsldbg component because it requires obsolete docbook extension of
libxml2
+- add two parser patches from NetBSD
+ (quanta_parsers_tag-netbsd.patch,
quanta_parts_kafka_kafkacommon-netbsd.patch)
+
+-------------------------------------------------------------------
New:
----
quanta_parsers_tag-netbsd.patch
quanta_parts_kafka_kafkacommon-netbsd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdewebdev3.spec ++++++
--- /var/tmp/diff_new_pack.OKABK4/_old 2013-02-18 13:46:59.000000000 +0100
+++ /var/tmp/diff_new_pack.OKABK4/_new 2013-02-18 13:46:59.000000000 +0100
@@ -26,7 +26,7 @@
Group: Productivity/Publishing/HTML/Tools
Version: 3.5.10
Release: 0
-Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}'
kdelibs3`)
+Requires: kdelibs3
Url: http://kdewebdev.org
Source0: kdewebdev-%{version}.tar.bz2
Source1: css.tar.bz2
@@ -38,6 +38,9 @@
Patch2: javascript.patch
#Patch3: only-quanta.diff
Patch4: no-applnk.diff
+Patch5: quanta_parsers_tag-netbsd.patch
+Patch6: quanta_parts_kafka_kafkacommon-netbsd.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -93,6 +96,12 @@
%patch2 -p1
popd
%patch4
+%patch5
+%patch6
+%if %suse_version >= 1230
+rm -rf kxsldbg
+%endif
+
. /etc/opt/kde3/common_options
update_admin
@@ -114,7 +123,9 @@
php/php.docrc \
$RPM_BUILD_ROOT/opt/kde3/share/apps/quanta/doc/
%suse_update_desktop_file -r klinkstatus Office WebDevelopment
+%if %suse_version < 1230
%suse_update_desktop_file -r kxsldbg Office WebDevelopment
+%endif
%suse_update_desktop_file -r kimagemapeditor Office WebDevelopment
%suse_update_desktop_file -r kfilereplace System FileManager
%suse_update_desktop_file kmdr-editor Development GUIDesigner
@@ -142,8 +153,10 @@
/opt/kde3/bin/kfilereplace
/opt/kde3/bin/kimagemapeditor
/opt/kde3/bin/klinkstatus
+%if %suse_version < 1230
/opt/kde3/bin/kxsldbg
/opt/kde3/bin/xsldbg
+%endif
%exclude /opt/kde3/%_lib/kde3/quanta*
#/opt/kde3/%_lib/kde3/*
/opt/kde3/%_lib/kde3/libkfilereplacepart.la
@@ -152,19 +165,25 @@
/opt/kde3/%_lib/kde3/libkimagemapeditor.so
/opt/kde3/%_lib/kde3/libklinkstatuspart.la
/opt/kde3/%_lib/kde3/libklinkstatuspart.so
+%if %suse_version < 1230
/opt/kde3/%_lib/kde3/libkxsldbgpart.la
/opt/kde3/%_lib/kde3/libkxsldbgpart.so
+%endif
/opt/kde3/share/applications/kde/kfilereplace.desktop
/opt/kde3/share/applications/kde/kimagemapeditor.desktop
/opt/kde3/share/applications/kde/klinkstatus.desktop
+%if %suse_version < 1230
/opt/kde3/share/applications/kde/kxsldbg.desktop
+%endif
/opt/kde3/share/apps/kfilereplace
/opt/kde3/share/apps/kfilereplacepart
/opt/kde3/share/apps/kimagemapeditor
/opt/kde3/share/apps/klinkstatus
/opt/kde3/share/apps/klinkstatuspart
+%if %suse_version < 1230
/opt/kde3/share/apps/kxsldbgpart
/opt/kde3/share/apps/kxsldbg
+%endif
/opt/kde3/share/config.kcfg/klinkstatus.kcfg
%exclude /opt/kde3/share/services/quanta*.desktop
%exclude /opt/kde3/share/services/kommander*.desktop
++++++ quanta_parsers_tag-netbsd.patch ++++++
$NetBSD: patch-quanta_parsers_tag.h,v 1.1 2013/01/17 16:04:49 joerg Exp $
--- quanta/parsers/tag.h.orig 2005-09-10 08:22:52.000000000 +0000
+++ quanta/parsers/tag.h
@@ -88,6 +88,8 @@ public:
void addAttribute(TagAttr attr) {attrs.append(attr);}
/** Get the attribute number index */
TagAttr getAttribute(uint index) const {return attrs[index];}
+ /** Get the attribute number index */
+ TagAttr &getAttributeWriteable(uint index) {return attrs[index];}
/** Remove the attribute number index */
void deleteAttribute(uint index) {attrs.remove(attrs.at(index));}
/** Insert a new Attribute, even if it already exists. Prefer using
editAttribute.
++++++ quanta_parts_kafka_kafkacommon-netbsd.patch ++++++
$NetBSD: patch-quanta_parts_kafka_kafkacommon.cpp,v 1.1 2013/01/17 16:04:49
joerg Exp $
--- quanta/parts/kafka/kafkacommon.cpp.orig 2013-01-17 13:00:59.000000000
+0000
+++ quanta/parts/kafka/kafkacommon.cpp
@@ -742,15 +742,15 @@ void kafkaCommon::fitsNodesPosition(Node
{
if(node->tag->getAttribute(j).nameLine == SNbeginLine)
{
- node->tag->getAttribute(j).nameLine += lineMovement;
- node->tag->getAttribute(j).nameCol += colMovement;
- node->tag->getAttribute(j).valueLine += lineMovement;
- node->tag->getAttribute(j).valueCol += colMovement;
+ node->tag->getAttributeWriteable(j).nameLine += lineMovement;
+ node->tag->getAttributeWriteable(j).nameCol += colMovement;
+ node->tag->getAttributeWriteable(j).valueLine += lineMovement;
+ node->tag->getAttributeWriteable(j).valueCol += colMovement;
}
else
{
- node->tag->getAttribute(j).nameLine += lineMovement;
- node->tag->getAttribute(j).valueLine += lineMovement;
+ node->tag->getAttributeWriteable(j).nameLine += lineMovement;
+ node->tag->getAttributeWriteable(j).valueLine += lineMovement;
}
}
node = getNextNode(node, b);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
