Hello community,
here is the log from the commit of package kdebindings-smokegen for
openSUSE:Factory
checked in at Fri Sep 9 13:19:57 CEST 2011.
--------
--- kdebindings-smokegen/kdebindings-smokegen.changes 2011-08-26
16:16:39.000000000 +0200
+++
/mounts/work_src_done/STABLE/kdebindings-smokegen/kdebindings-smokegen.changes
2011-09-07 14:16:32.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 1 23:32:40 CEST 2011 - dmuel...@suse.de
+
+- update to 4.7.1
+ * Bugfixes over KDE 4.7.0
+ * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for
details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
smokegen-4.7.0.tar.bz2
New:
----
smokegen-4.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings-smokegen.spec ++++++
--- /var/tmp/diff_new_pack.nbBgCl/_old 2011-09-09 13:19:52.000000000 +0200
+++ /var/tmp/diff_new_pack.nbBgCl/_new 2011-09-09 13:19:52.000000000 +0200
@@ -18,9 +18,9 @@
Name: kdebindings-smokegen
-Version: 4.7.0
-Release: 3
-License: GPL-2.0
+Version: 4.7.1
+Release: 1
+License: GPL v2.0
Summary: Smoke Generator for kdebindings
Url:
https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen
Group: Development/Libraries/KDE
@@ -39,8 +39,9 @@
It is currently used for generating the various KDE SMOKE libraries.
%package -n libsmokegen-devel
-
+License: GPL v2.0
Summary: Development files for kdebindings-smokegen
+Group: Development/Libraries/KDE
Obsoletes: libsmoke-devel < %{version}
Provides: libsmoke-devel = %{version}
Requires: %{name} = %{version}
@@ -81,6 +82,7 @@
%{_kde4_libdir}/*.so.*
%{_kde4_libdir}/smokegen/
%{_datadir}/smoke/
+%{_datadir}/smokegen/
%files -n libsmokegen-devel
%defattr(-,root,root)
++++++ smokegen-4.7.0.tar.bz2 -> smokegen-4.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokegen-4.7.0/AUTHORS new/smokegen-4.7.1/AUTHORS
--- old/smokegen-4.7.0/AUTHORS 1970-01-01 01:00:00.000000000 +0100
+++ new/smokegen-4.7.1/AUTHORS 2011-08-22 15:23:15.000000000 +0200
@@ -0,0 +1,2 @@
+Arno Rehn <arno at arnorehn.de> - author
+Richard Dale <richard.j.dale at gmail.com> - maintainer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokegen-4.7.0/CMakeLists.txt
new/smokegen-4.7.1/CMakeLists.txt
--- old/smokegen-4.7.0/CMakeLists.txt 2011-05-20 22:33:31.000000000 +0200
+++ new/smokegen-4.7.1/CMakeLists.txt 2011-08-22 15:23:15.000000000 +0200
@@ -45,6 +45,7 @@
install(TARGETS smokegen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(FILES generatorenvironment.h generator_export.h
generatorpreprocessor.h generatorvisitor.h name_compiler.h options.h
type_compiler.h type.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/smokegen)
install( FILES smoke.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
+install( FILES smokegen_string.h DESTINATION
${CMAKE_INSTALL_PREFIX}/share/smokegen RENAME string.h )
add_subdirectory(cmake)
add_subdirectory(generators)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokegen-4.7.0/generatorpreprocessor.cpp
new/smokegen-4.7.1/generatorpreprocessor.cpp
--- old/smokegen-4.7.0/generatorpreprocessor.cpp 2011-05-20
22:33:31.000000000 +0200
+++ new/smokegen-4.7.1/generatorpreprocessor.cpp 2011-08-22
15:23:15.000000000 +0200
@@ -22,6 +22,8 @@
#include <rpp/pp-environment.h>
#include <rpp/pp-macro.h>
+#include <QCoreApplication>
+
#include <QtDebug>
QList<QString> parsedHeaders;
@@ -100,6 +102,32 @@
exportMacro->variadics = false;
m_topBlock->setMacro(exportMacro);
+ // the following macros are gcc specialties
+ exportMacro = new rpp::pp_macro;
+ exportMacro->name = IndexedString("__extension__");
+ exportMacro->function_like = false;
+ exportMacro->variadics = false;
+ m_topBlock->setMacro(exportMacro);
+
+ exportMacro = new rpp::pp_macro;
+ exportMacro->name = IndexedString("__restrict");
+ exportMacro->function_like = false;
+ exportMacro->variadics = false;
+ m_topBlock->setMacro(exportMacro);
+
+ exportMacro = new rpp::pp_macro;
+ exportMacro->name = IndexedString("__const");
+ exportMacro->definition.append(IndexedString("const"));
+ exportMacro->function_like = false;
+ exportMacro->variadics = false;
+ m_topBlock->setMacro(exportMacro);
+
+ exportMacro = new rpp::pp_macro;
+ exportMacro->name = IndexedString("__attribute__");
+ exportMacro->function_like = true;
+ exportMacro->variadics = false;
+ m_topBlock->setMacro(exportMacro);
+
exportMacro = new rpp::pp_macro;
exportMacro->name = IndexedString("__SMOKEGEN_RUN__");
exportMacro->definition.append(IndexedString('1'));
@@ -181,7 +209,7 @@
if (m_fileStack.top().fileName() == fileName && type ==
rpp::Preprocessor::IncludeGlobal) {
#ifdef DEBUG
- qDebug("prevented possible endless loop because of #include<%s>",
qPrintable(fileName));
+ qDebug("prevented possible endless loop because of #include <%s>",
qPrintable(fileName));
#endif
return 0;
}
@@ -195,8 +223,12 @@
QString path;
QFileInfo info(fileName);
-
- if (info.isAbsolute()) {
+
+ // smokegen chokes on gcc's string.h, so use our simplified version here
+ if (type == rpp::Preprocessor::IncludeGlobal && fileName == "string.h") {
+ static QString customStringHPath = qApp->applicationDirPath() +
"/../share/smokegen/string.h";
+ path = customStringHPath;
+ } else if (info.isAbsolute()) {
path = fileName;
} else if (type == rpp::Preprocessor::IncludeLocal) {
info.setFile(m_fileStack.last().dir(), fileName);
@@ -234,8 +266,12 @@
}
}
- if (path.isEmpty())
+ if (path.isEmpty()) {
+#ifdef DEBUG
+ qDebug("PP: File not found: %s", qPrintable(fileName));
+#endif
return 0;
+ }
QFile file(path);
file.open(QFile::ReadOnly);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smokegen-4.7.0/smokegen_string.h
new/smokegen-4.7.1/smokegen_string.h
--- old/smokegen-4.7.0/smokegen_string.h 1970-01-01 01:00:00.000000000
+0100
+++ new/smokegen-4.7.1/smokegen_string.h 2011-08-22 15:23:15.000000000
+0200
@@ -0,0 +1,43 @@
+// smokegen uses this file instead of /usr/include/string.h because
+// it chokes on some of gcc's language additions.
+
+#ifndef _STRING_H
+#define _STRING_H 1
+
+#include <stddef.h>
+
+void *memccpy(void *, const void *, int, size_t);
+
+void *memchr(const void *, int, size_t);
+int memcmp(const void *, const void *, size_t);
+void *memcpy(void *, const void *, size_t);
+void *memmove(void *, const void *, size_t);
+void *memset(void *, int, size_t);
+char *strcat(char *, const char *);
+char *strchr(const char *, int);
+int strcmp(const char *, const char *);
+int strcoll(const char *, const char *);
+char *strcpy(char *, const char *);
+size_t strcspn(const char *, const char *);
+
+char *strdup(const char *);
+
+char *strerror(int);
+
+int *strerror_r(int, char *, size_t);
+
+size_t strlen(const char *);
+char *strncat(char *, const char *, size_t);
+int strncmp(const char *, const char *, size_t);
+char *strncpy(char *, const char *, size_t);
+char *strpbrk(const char *, const char *);
+char *strrchr(const char *, int);
+size_t strspn(const char *, const char *);
+char *strstr(const char *, const char *);
+char *strtok(char *, const char *);
+
+char *strtok_r(char *, const char *, char **);
+
+size_t strxfrm(char *, const char *, size_t);
+
+#endif // _STRING_H
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
