Hello community,
here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory checked in at 2012-11-06 16:08:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdevelop4-plugins (Old)
and /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop4-plugins", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdevelop4-plugins/kdevelop4-plugins.changes 2012-09-25 10:26:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new/kdevelop4-plugins.changes 2012-11-06 16:08:39.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Nov 4 12:34:09 UTC 2012 - mailaender@opensuse.org
+
+- Update to 1.4.0
+ * Validate imported parent context before accessing it.
+
+-------------------------------------------------------------------
Old:
----
kdevelop-php-1.3.90.tar.bz2
kdevelop-php-docs-1.3.90.tar.bz2
New:
----
kdevelop-php-1.4.0.tar.bz2
kdevelop-php-docs-1.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop4-plugins.spec ++++++
--- /var/tmp/diff_new_pack.LLTAFP/_old 2012-11-06 16:08:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LLTAFP/_new 2012-11-06 16:08:40.000000000 +0100
@@ -17,7 +17,7 @@
Name: kdevelop4-plugins
-Version: 1.3.90
+Version: 1.4.0
Release: 0
Summary: Additional plugins for KDevelop4 Integrated Development Environment
License: GPL-2.0+
++++++ add-php-docs.diff ++++++
--- /var/tmp/diff_new_pack.LLTAFP/_old 2012-11-06 16:08:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LLTAFP/_new 2012-11-06 16:08:40.000000000 +0100
@@ -4,7 +4,7 @@
add_subdirectory(parser)
add_subdirectory(duchain)
add_subdirectory(completion)
-+add_subdirectory(kdevelop-php-docs-1.3.90)
++add_subdirectory(kdevelop-php-docs-1.4.0)
set(kdevphplanguagesupport_PART_SRCS
phplanguagesupport.cpp
++++++ kdevelop-php-1.3.90.tar.bz2 -> kdevelop-php-1.4.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/CHANGELOG.1.3.90 new/kdevelop-php-1.4.0/CHANGELOG.1.3.90
--- old/kdevelop-php-1.3.90/CHANGELOG.1.3.90 2012-09-05 13:09:50.000000000 +0200
+++ new/kdevelop-php-1.4.0/CHANGELOG.1.3.90 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-ChangeLog for php v1.3.90
-=========================
-
-* Milian Wolff: set version to 1.3.90, i.e. 1.4 RC1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/CHANGELOG.1.4.0 new/kdevelop-php-1.4.0/CHANGELOG.1.4.0
--- old/kdevelop-php-1.3.90/CHANGELOG.1.4.0 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-1.4.0/CHANGELOG.1.4.0 2012-10-15 23:45:44.000000000 +0200
@@ -0,0 +1,5 @@
+ChangeLog for php v1.4.0
+========================
+
+* Milian Wolff: Set version to 1.4.0 and require KDevplatform 1.4.0
+* Milian Wolff: Validate imported parent context before accessing it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/CMakeLists.txt new/kdevelop-php-1.4.0/CMakeLists.txt
--- old/kdevelop-php-1.3.90/CMakeLists.txt 2012-09-05 13:14:07.000000000 +0200
+++ new/kdevelop-php-1.4.0/CMakeLists.txt 2012-10-15 23:49:40.000000000 +0200
@@ -1,8 +1,8 @@
PROJECT(php)
set(KDEVPHP_VERSION_MAJOR 1)
-set(KDEVPHP_VERSION_MINOR 3)
-set(KDEVPHP_VERSION_PATCH 90)
+set(KDEVPHP_VERSION_MINOR 4)
+set(KDEVPHP_VERSION_PATCH 0)
configure_file( "${php_SOURCE_DIR}/kdevphpversion.h.cmake" "${php_BINARY_DIR}/kdevphpversion.h" @ONLY )
@@ -15,7 +15,7 @@
#complain about the FindKDevelop-PG.cmake file not findable.
find_package(KDE4 REQUIRED)
-find_package(KDevPlatform 1.3.80 REQUIRED)
+find_package(KDevPlatform 1.4.0 REQUIRED)
include_directories(${KDEVPLATFORM_INCLUDE_DIR})
include_directories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/duchain/helper.cpp new/kdevelop-php-1.4.0/duchain/helper.cpp
--- old/kdevelop-php-1.3.90/duchain/helper.cpp 2012-09-05 13:09:50.000000000 +0200
+++ new/kdevelop-php-1.4.0/duchain/helper.cpp 2012-10-15 23:45:44.000000000 +0200
@@ -107,8 +107,9 @@
}
if (classCtx) {
foreach(const DUContext::Import &i, classCtx->importedParentContexts()) {
- if (i.context(classCtx->topContext())->type() == DUContext::Class) {
- return DeclarationPointer(i.context(classCtx->topContext())->owner());
+ DUContext* ctx = i.context(classCtx->topContext());
+ if (ctx && ctx->type() == DUContext::Class) {
+ return DeclarationPointer(ctx->owner());
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/po/ca/kdevphp.po new/kdevelop-php-1.4.0/po/ca/kdevphp.po
--- old/kdevelop-php-1.3.90/po/ca/kdevphp.po 2012-09-05 13:10:21.000000000 +0200
+++ new/kdevelop-php-1.4.0/po/ca/kdevphp.po 2012-10-15 23:46:12.000000000 +0200
@@ -4,20 +4,20 @@
#
# Manuel Tortosa , 2009, 2010.
# Manuel Tortosa Moreno , 2010.
-# Josep Ma. Ferrer , 2010.
+# Josep Ma. Ferrer , 2010, 2012.
msgid ""
msgstr ""
"Project-Id-Version: kdevphp\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2012-07-24 21:11+0200\n"
-"PO-Revision-Date: 2010-09-10 17:18+0200\n"
+"PO-Revision-Date: 2012-10-12 18:18+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
"X-Language: ca_ES\n"
@@ -144,7 +144,7 @@
#: duchain/builders/usebuilder.cpp:142
#, kde-format
msgid "Declaration not found: %1"
-msgstr ""
+msgstr "No s'ha trobat la declaració: %1"
#: duchain/navigation/declarationnavigationcontext.cpp:123
msgid "PHP internal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/po/da/kdevphp.po new/kdevelop-php-1.4.0/po/da/kdevphp.po
--- old/kdevelop-php-1.3.90/po/da/kdevphp.po 2012-09-05 13:10:36.000000000 +0200
+++ new/kdevelop-php-1.4.0/po/da/kdevphp.po 2012-10-15 23:46:26.000000000 +0200
@@ -2,20 +2,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Morten Anton Bach Sjøgren , 2010.
-# Martin Schlander , 2010.
+# Martin Schlander , 2010, 2012.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2012-07-24 21:11+0200\n"
-"PO-Revision-Date: 2010-09-15 15:07+0200\n"
+"PO-Revision-Date: 2012-09-16 15:17+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
msgctxt "NAME OF TRANSLATORS"
@@ -136,7 +136,7 @@
#: duchain/builders/usebuilder.cpp:142
#, kde-format
msgid "Declaration not found: %1"
-msgstr ""
+msgstr "Erklæring ikke fundet: %1"
#: duchain/navigation/declarationnavigationcontext.cpp:123
msgid "PHP internal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/po/et/kdevphp.po new/kdevelop-php-1.4.0/po/et/kdevphp.po
--- old/kdevelop-php-1.3.90/po/et/kdevphp.po 2012-09-05 13:10:52.000000000 +0200
+++ new/kdevelop-php-1.4.0/po/et/kdevphp.po 2012-10-15 23:46:40.000000000 +0200
@@ -2,20 +2,20 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Marek Laane , 2009, 2010.
+# Marek Laane , 2009, 2010, 2012.
msgid ""
msgstr ""
"Project-Id-Version: kdevphp\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2012-07-24 21:11+0200\n"
-"PO-Revision-Date: 2010-09-13 16:43+0300\n"
+"PO-Revision-Date: 2012-10-08 19:39+0300\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
msgctxt "NAME OF TRANSLATORS"
@@ -138,7 +138,7 @@
#: duchain/builders/usebuilder.cpp:142
#, kde-format
msgid "Declaration not found: %1"
-msgstr ""
+msgstr "Deklaratsiooni ei leitud: %1"
#: duchain/navigation/declarationnavigationcontext.cpp:123
msgid "PHP internal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/po/nb/kdevphp.po new/kdevelop-php-1.4.0/po/nb/kdevphp.po
--- old/kdevelop-php-1.3.90/po/nb/kdevphp.po 2012-09-05 13:12:23.000000000 +0200
+++ new/kdevelop-php-1.4.0/po/nb/kdevphp.po 2012-10-15 23:48:04.000000000 +0200
@@ -19,6 +19,14 @@
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Bjørn Steensrud"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "bjornst@skogkatt.homelinux.org"
+
#: completion/implementationitem.cpp:69
msgid "Override"
msgstr "Overstyr"
@@ -211,14 +219,4 @@
#: phplanguagesupport.cpp:65
msgid "Niko Sams"
-msgstr "Niko Sams"
-
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "Bjørn Steensrud"
-
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "bjornst@skogkatt.homelinux.org"
\ No newline at end of file
+msgstr "Niko Sams"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.3.90/po/zh_TW/kdevphp.po new/kdevelop-php-1.4.0/po/zh_TW/kdevphp.po
--- old/kdevelop-php-1.3.90/po/zh_TW/kdevphp.po 2012-09-05 13:14:06.000000000 +0200
+++ new/kdevelop-php-1.4.0/po/zh_TW/kdevphp.po 2012-10-15 23:49:39.000000000 +0200
@@ -3,20 +3,20 @@
#
# Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2009, 2010.
# Frank Weng (a.k.a. Franklin) , 2009, 2010.
-# Franklin Weng , 2010.
+# Franklin Weng , 2010, 2012.
msgid ""
msgstr ""
"Project-Id-Version: kdevphp\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2012-07-24 21:11+0200\n"
-"PO-Revision-Date: 2010-10-29 09:05+0800\n"
-"Last-Translator: Franklin Weng \n"
-"Language-Team: Chinese Traditional \n"
-"Language: \n"
+"PO-Revision-Date: 2012-09-20 08:31+0800\n"
+"Last-Translator: \n"
+"Language-Team: Chinese Traditional \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=1; plural=0;\n"
msgctxt "NAME OF TRANSLATORS"
@@ -135,7 +135,7 @@
#: duchain/builders/usebuilder.cpp:142
#, kde-format
msgid "Declaration not found: %1"
-msgstr ""
+msgstr "找不到宣告:%1"
#: duchain/navigation/declarationnavigationcontext.cpp:123
msgid "PHP internal"
++++++ kdevelop-php-docs-1.3.90.tar.bz2 -> kdevelop-php-docs-1.4.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.90/CHANGELOG.1.3.90 new/kdevelop-php-docs-1.4.0/CHANGELOG.1.3.90
--- old/kdevelop-php-docs-1.3.90/CHANGELOG.1.3.90 2012-09-05 13:14:13.000000000 +0200
+++ new/kdevelop-php-docs-1.4.0/CHANGELOG.1.3.90 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-ChangeLog for php-docs v1.3.90
-==============================
-
-* Milian Wolff: set version to 1.3.90, i.e. 1.4 RC1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.90/CHANGELOG.1.4.0 new/kdevelop-php-docs-1.4.0/CHANGELOG.1.4.0
--- old/kdevelop-php-docs-1.3.90/CHANGELOG.1.4.0 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-docs-1.4.0/CHANGELOG.1.4.0 2012-10-15 23:49:42.000000000 +0200
@@ -0,0 +1,4 @@
+ChangeLog for php-docs v1.4.0
+=============================
+
+* Milian Wolff: Set version to 1.4.0 and require KDevplatform 1.4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.90/CMakeLists.txt new/kdevelop-php-docs-1.4.0/CMakeLists.txt
--- old/kdevelop-php-docs-1.3.90/CMakeLists.txt 2012-09-05 13:18:30.000000000 +0200
+++ new/kdevelop-php-docs-1.4.0/CMakeLists.txt 2012-10-15 23:53:36.000000000 +0200
@@ -1,8 +1,8 @@
PROJECT(phpdocs)
set(KDEVPHPDOCS_VERSION_MAJOR 1)
-set(KDEVPHPDOCS_VERSION_MINOR 3)
-set(KDEVPHPDOCS_VERSION_PATCH 90)
+set(KDEVPHPDOCS_VERSION_MINOR 4)
+set(KDEVPHPDOCS_VERSION_PATCH 0)
configure_file( "${phpdocs_SOURCE_DIR}/kdevphpdocsversion.h.cmake" "${phpdocs_BINARY_DIR}/kdevphpdocsversion.h" @ONLY )
@@ -10,7 +10,7 @@
enable_testing()
find_package(KDE4 REQUIRED)
-find_package(KDevPlatform 1.3.80 REQUIRED)
+find_package(KDevPlatform 1.4.0 REQUIRED)
include_directories(${KDEVPLATFORM_INCLUDE_DIR})
include_directories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.90/po/nb/kdevphpdocs.po new/kdevelop-php-docs-1.4.0/po/nb/kdevphpdocs.po
--- old/kdevelop-php-docs-1.3.90/po/nb/kdevphpdocs.po 2012-09-05 13:16:46.000000000 +0200
+++ new/kdevelop-php-docs-1.4.0/po/nb/kdevphpdocs.po 2012-10-15 23:52:02.000000000 +0200
@@ -19,53 +19,21 @@
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
-#: phpdocsmodel.cpp:114
-msgid "<lost declaration>"
-msgstr "<mistet deklarasjon>"
-
-#: phpdocsplugin.cpp:56
-msgid "PhpDocs"
-msgstr "PhpDocs"
-
-#: phpdocsplugin.cpp:57
-msgid "Check PHP.net documentation"
-msgstr "Sjekk PHP.net-dokumentasjon"
-
-#: phpdocsplugin.cpp:58
-msgid "Milian Wolff"
-msgstr "Milian Wolff"
-
-#: phpdocsplugin.cpp:59
-msgid "Maintainer"
-msgstr "Vedlikeholder"
-
-#: phpdocsplugin.cpp:230
-msgid "PHP Documentation"
-msgstr "PHP-dokumentasjon"
-
-#: phpdocumentationwidget.cpp:75
-msgid "...loading documentation..."
-msgstr "… laster dokumentasjon …"
-
-#: rc.cpp:1
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Bjørn Steensrud"
-#: rc.cpp:2
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "bjornst@skogkatt.homelinux.org"
-#. i18n: file: phpdocsconfig.ui:20
#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc)
-#: rc.cpp:5
+#: phpdocsconfig.ui:20
msgid "PHP Manual Integration"
msgstr "PHP håndbok-integrering"
-#. i18n: file: phpdocsconfig.ui:36
#. i18n: ectx: property (text), widget (QLabel, PhpDocNote)
-#: rc.cpp:8
+#: phpdocsconfig.ui:36
msgid ""
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
"REC-html40/strict.dtd\">\n"
@@ -98,21 +66,42 @@
"vil. Pass på at du lastet ned pakka \"HTML format, mange filer\"</span> package.</p></body></html>"
-#. i18n: file: phpdocsconfig.ui:54
#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel)
-#: rc.cpp:15
+#: phpdocsconfig.ui:54
msgid "Location:"
msgstr "Plassering:"
-#. i18n: file: phpdocssettings.kcfg:10
+#: phpdocsmodel.cpp:114
+msgid "<lost declaration>"
+msgstr "<mistet deklarasjon>"
+
+#: phpdocsplugin.cpp:56
+msgid "PhpDocs"
+msgstr "PhpDocs"
+
+#: phpdocsplugin.cpp:57
+msgid "Check PHP.net documentation"
+msgstr "Sjekk PHP.net-dokumentasjon"
+
+#: phpdocsplugin.cpp:58
+msgid "Milian Wolff"
+msgstr "Milian Wolff"
+
+#: phpdocsplugin.cpp:59
+msgid "Maintainer"
+msgstr "Vedlikeholder"
+
+#: phpdocsplugin.cpp:230
+msgid "PHP Documentation"
+msgstr "PHP-dokumentasjon"
+
#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation)
-#: rc.cpp:18
+#: phpdocssettings.kcfg:10
msgid "Specifies the location of the PHP documentation to use."
msgstr "Oppgir plasseringen til den PHP-dokumentasjonen som skal brukes."
-#. i18n: file: phpdocssettings.kcfg:13
#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation)
-#: rc.cpp:21
+#: phpdocssettings.kcfg:13
msgid ""
"The location of the PHP documentation to use. You can either use a remote\n"
" location like http://php.net or a local directory which "
@@ -124,12 +113,15 @@
"inneholder\n"
" PHP-dokumentasjonen i HTML-format med mange filer."
-#. i18n: file: phpdocssettings.kcfg:15
#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation)
-#: rc.cpp:26
+#: phpdocssettings.kcfg:15
msgid ""
"Make sure local copies are downloaded in HTML format with many files.\n"
" "
msgstr ""
"Se til at lokale kopier er lastet ned i HTML-format med mange filer.\n"
-" "
\ No newline at end of file
+" "
+
+#: phpdocumentationwidget.cpp:75
+msgid "...loading documentation..."
+msgstr "… laster dokumentasjon …"
\ No newline at end of file
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org