![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package kdebindings-smokegen for openSUSE:Factory checked in at 2013-07-08 07:34:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebindings-smokegen (Old)
and /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebindings-smokegen"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebindings-smokegen/kdebindings-smokegen.changes 2013-06-11 09:31:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new/kdebindings-smokegen.changes 2013-07-08 07:34:07.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jun 27 18:10:42 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.90
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta2.php
+
+-------------------------------------------------------------------
+Thu Jun 13 19:13:56 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.80
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta1.php
+
+-------------------------------------------------------------------
Old:
----
smokegen-4.10.4.tar.xz
New:
----
smokegen-4.10.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings-smokegen.spec ++++++
--- /var/tmp/diff_new_pack.33zQnI/_old 2013-07-08 07:34:07.000000000 +0200
+++ /var/tmp/diff_new_pack.33zQnI/_new 2013-07-08 07:34:07.000000000 +0200
@@ -17,7 +17,7 @@
Name: kdebindings-smokegen
-Version: 4.10.4
+Version: 4.10.90
Release: 0
Summary: Smoke Generator for kdebindings
License: GPL-2.0
++++++ smokegen-4.10.4.tar.xz -> smokegen-4.10.90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.10.4/cmake/SmokeConfig.cmake.in new/smokegen-4.10.90/cmake/SmokeConfig.cmake.in
--- old/smokegen-4.10.4/cmake/SmokeConfig.cmake.in 2013-05-28 20:42:27.000000000 +0200
+++ new/smokegen-4.10.90/cmake/SmokeConfig.cmake.in 2013-06-10 20:51:33.000000000 +0200
@@ -34,7 +34,7 @@
##############################
# find individual smoke libs #
-##############################Smoke_FIND_REQUIRED
+##############################
macro (find_smoke_component name)
string(TOUPPER ${name} uppercase)
@@ -45,21 +45,12 @@
find_path(SMOKE_${uppercase}_INCLUDE_DIR
${lowercase}_smoke.h
- PATH ${SMOKE_INCLUDE_DIR}
- NO_DEFAULT_PATH
- )
- if(WIN32)
- # DLLs are in the bin directory.
- find_library(SMOKE_${uppercase}_LIBRARY
- smoke${lowercase}
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
- NO_DEFAULT_PATH)
- else(WIN32)
- find_library(SMOKE_${uppercase}_LIBRARY
- smoke${lowercase}
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
- endif(WIN32)
+ HINTS ${SMOKE_INCLUDE_DIR}
+ PATH_SUFFIXES smoke)
+
+ find_library(SMOKE_${uppercase}_LIBRARY
+ smoke${lowercase}
+ HINTS "@SMOKE_LIBRARY_PREFIX@")
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
if (Smoke_FIND_REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.10.4/generators/smoke/CMakeLists.txt new/smokegen-4.10.90/generators/smoke/CMakeLists.txt
--- old/smokegen-4.10.4/generators/smoke/CMakeLists.txt 2013-05-28 20:42:27.000000000 +0200
+++ new/smokegen-4.10.90/generators/smoke/CMakeLists.txt 2013-06-10 20:51:33.000000000 +0200
@@ -7,7 +7,7 @@
helpers.cpp)
add_library(generator_smoke MODULE ${generator_smoke_SRC})
-target_link_libraries(generator_smoke ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} smokegen)
+target_link_libraries(generator_smoke smokebase ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} smokegen)
set_target_properties(generator_smoke PROPERTIES PREFIX "")
if (WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.10.4/generators/smoke/generator_smoke.cpp new/smokegen-4.10.90/generators/smoke/generator_smoke.cpp
--- old/smokegen-4.10.4/generators/smoke/generator_smoke.cpp 2013-05-28 20:42:27.000000000 +0200
+++ new/smokegen-4.10.90/generators/smoke/generator_smoke.cpp 2013-06-10 20:51:33.000000000 +0200
@@ -41,6 +41,7 @@
int Options::parts = 20;
QString Options::module = "qt";
QStringList Options::parentModules;
+QDir Options::libDir;
QStringList Options::scalarTypes;
QStringList Options::voidpTypes;
bool Options::qtMode = false;
@@ -56,7 +57,8 @@
" -p <parts> (default: 20)" << std::endl <<
" -pm <comma-seperated list of parent modules>" << std::endl <<
" -st <comma-seperated list of types that should be munged to scalars>" << std::endl <<
- " -vt <comma-seperated list of types that should be mapped to Smoke::t_voidp>" << std::endl;
+ " -vt <comma-seperated list of types that should be mapped to Smoke::t_voidp>" << std::endl <<
+ " -L <directory containing parent libs> (parent smoke libs can be located in a <modulename> subdirectory>)" << std::endl;
}
extern "C" Q_DECL_EXPORT
@@ -68,8 +70,9 @@
const QStringList& args = QCoreApplication::arguments();
for (int i = 0; i < args.count(); i++) {
- if ((args[i] == "-m" || args[i] == "-p" || args[i] == "-pm" || args[i] == "-o" ||
- args[i] == "-st" || args[i] == "-vt" || args[i] == "-smokeconfig") && i + 1 >= args.count())
+ if ( (args[i] == "-m" || args[i] == "-p" || args[i] == "-pm" || args[i] == "-o" ||
+ args[i] == "-st" || args[i] == "-vt" || args[i] == "-smokeconfig" || args[i] == "-L")
+ && i + 1 >= args.count())
{
qCritical() << "generator_smoke: not enough parameters for option" << args[i];
return EXIT_FAILURE;
@@ -92,6 +95,8 @@
smokeConfig = QFileInfo(args[++i]);
} else if (args[i] == "-o") {
Options::outputDir = QDir(args[++i]);
+ } else if (args[i] == "-L") {
+ Options::libDir = QDir(args[++i]);
} else if (args[i] == "-h" || args[i] == "--help") {
showUsage();
return EXIT_SUCCESS;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.10.4/generators/smoke/globals.h new/smokegen-4.10.90/generators/smoke/globals.h
--- old/smokegen-4.10.4/generators/smoke/globals.h 2013-05-28 20:42:27.000000000 +0200
+++ new/smokegen-4.10.90/generators/smoke/globals.h 2013-06-10 20:51:33.000000000 +0200
@@ -47,6 +47,7 @@
static int parts;
static QString module;
static QStringList parentModules;
+ static QDir libDir;
static QStringList scalarTypes;
static QStringList voidpTypes;
static QList<QFileInfo> headerList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.10.4/generators/smoke/helpers.cpp new/smokegen-4.10.90/generators/smoke/helpers.cpp
--- old/smokegen-4.10.4/generators/smoke/helpers.cpp 2013-05-28 20:42:27.000000000 +0200
+++ new/smokegen-4.10.90/generators/smoke/helpers.cpp 2013-06-10 20:51:33.000000000 +0200
@@ -17,15 +17,21 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <QFileInfo>
#include <QHash>
#include <QList>
+#include <QLibrary>
#include <QStack>
+#include <QDir>
#include