debian/0000755000000000000000000000000011750012245007163 5ustar debian/compat0000644000000000000000000000000211750010013010350 0ustar 9 debian/libqtscript4-xmlpatterns.install0000644000000000000000000000035411750010031015547 0ustar usr/lib/*/qt4/plugins/script/libqtscript_xmlpatterns.so usr/lib/*/qt4/plugins/script/libqtscript_xmlpatterns.so.1 usr/lib/*/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0.0 debian/qtscript-tools.manpages0000644000000000000000000000002111747765613013724 0ustar debian/qs_eval.1 debian/libqtscript4-svg.install0000644000000000000000000000031411750010031013761 0ustar usr/lib/*/qt4/plugins/script/libqtscript_svg.so usr/lib/*/qt4/plugins/script/libqtscript_svg.so.1 usr/lib/*/qt4/plugins/script/libqtscript_svg.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_svg.so.1.0.0 debian/libqtscript4-sql.install0000644000000000000000000000031411750010031013761 0ustar usr/lib/*/qt4/plugins/script/libqtscript_sql.so usr/lib/*/qt4/plugins/script/libqtscript_sql.so.1 usr/lib/*/qt4/plugins/script/libqtscript_sql.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_sql.so.1.0.0 debian/libqtscript4-xml.install0000644000000000000000000000031411750010031013762 0ustar usr/lib/*/qt4/plugins/script/libqtscript_xml.so usr/lib/*/qt4/plugins/script/libqtscript_xml.so.1 usr/lib/*/qt4/plugins/script/libqtscript_xml.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_xml.so.1.0.0 debian/qs_eval.10000644000000000000000000000137411747765613010730 0ustar .TH QS_EVAL 1 "March 2009" "Qt Script" "A simple Qt Script interpreter" .SH NAME qs_eval \- A simple Qt Script interpreter / launcher .SH SYNOPSIS qs_eval [options] [FILE] [FILE ..] .SH DESCRIPTION qs_eval is a simple script interpreter / launcher that imports all the bindings. You can use it to run the examples found in /usr/share/doc/libqtscript4-doc/examples, e.g. with the examples directory being the working directory. If no script files are specified, qs_eval will enter interactive mode. .SS Arguments: FILE Qt Script file to run .SS .SS Options: .TP .B \-tty Assume the script is a console application (QApplication::Tty) .SH AUTHORS .P Trolltech ASA .P Manual page was written by Modestas Vainius for Debian GNU/Linux distribution. debian/libqtscript4-webkit.install0000644000000000000000000000033011750010031014445 0ustar usr/lib/*/qt4/plugins/script/libqtscript_webkit.so usr/lib/*/qt4/plugins/script/libqtscript_webkit.so.1 usr/lib/*/qt4/plugins/script/libqtscript_webkit.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_webkit.so.1.0.0 debian/libqtscript4-opengl.install0000644000000000000000000000033011750010031014444 0ustar usr/lib/*/qt4/plugins/script/libqtscript_opengl.so usr/lib/*/qt4/plugins/script/libqtscript_opengl.so.1 usr/lib/*/qt4/plugins/script/libqtscript_opengl.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_opengl.so.1.0.0 debian/control0000644000000000000000000001635711750011171010577 0ustar Source: qtscriptgenerator Section: libs Priority: optional Maintainer: Modestas Vainius Build-Depends: debhelper (>= 9~), qt4-qmake (>= 4:4.8.0), libqt4-dev (>= 4:4.8.0), libqt4-opengl-dev (>= 4:4.8.0), libphonon-dev (>= 4:4.3.0), libqtwebkit-dev Standards-Version: 3.9.3 Homepage: http://code.google.com/p/qtscriptgenerator/ Vcs-Git: git://git.debian.org/users/modax/qtscriptgenerator.git Vcs-Browser: http://git.debian.org/?p=users/modax/qtscriptgenerator.git;a=summary Package: libqtscript4-qtbindings Architecture: any Multi-Arch: same Depends: libqtscript4-core (>= ${source:Version}), libqtscript4-gui (>= ${source:Version}), libqtscript4-network (>= ${source:Version}), libqtscript4-opengl (>= ${source:Version}), libqtscript4-phonon (>= ${source:Version}), libqtscript4-sql (>= ${source:Version}), libqtscript4-svg (>= ${source:Version}), libqtscript4-xml (>= ${source:Version}), libqtscript4-xmlpatterns (>= ${source:Version}), libqtscript4-webkit (>= ${source:Version}), libqtscript4-uitools (>= ${source:Version}), ${misc:Depends} Description: QtScript bindings for Qt 4 - metapackage QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This metapackage depends on all modules of the QtScript bindings that are currently provided for the Qt 4 application and UI framework. Package: libqtscript4-core Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: QtScript bindings for the Qt 4 Core library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 Core library. Package: libqtscript4-gui Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 Gui library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 Gui library. Package: libqtscript4-network Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 Network library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 Network library. Package: libqtscript4-opengl Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 OpenGL library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 OpenGL library. Package: libqtscript4-phonon Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 Phonon library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 Phonon library. Package: libqtscript4-sql Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 SQL library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 SQL library. Package: libqtscript4-svg Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 SVG library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 SVG library. Package: libqtscript4-xml Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 XML library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 XML library. Package: libqtscript4-webkit Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 WebKit library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 WebKit library. Package: libqtscript4-xmlpatterns Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 XML patterns library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 XML patterns library. Package: libqtscript4-uitools Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libqtscript4-core (= ${binary:Version}) Description: QtScript bindings for the Qt 4 UiTools library QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains bindings for the Qt 4 UiTools library. Package: qtscript-tools Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: libqtscript4-qtbindings Suggests: libqtscript4-doc Description: tools for QtScript developers This package contains QtScript Generator and a simple helper program which can be used to launch scripts from the command line. . QtScript Generator is a tool that generates Qt bindings for QtScript. With the generated bindings you get access to substantial portions of the Qt API from within QtScript. The binary has been renamed to 'qs_generator' in this package. . qs_eval is a simple script interpreter / launcher that imports all the bindings. You can use it to run examples found in the libqtscript4-doc package. Package: libqtscript4-doc Section: doc Architecture: all Depends: ${misc:Depends} Description: Qt 4 QtScript bindings API documentation and examples QtScript is a scripting language based on the ECMAScript standard, with bindings that give access to substantial portions of the Qt 4 API. . This package contains the API reference of the Qt Script bindings (in HTML format) and a few script examples. debian/libqtscript4-uitools.install0000644000000000000000000000033411750010031014662 0ustar usr/lib/*/qt4/plugins/script/libqtscript_uitools.so usr/lib/*/qt4/plugins/script/libqtscript_uitools.so.1 usr/lib/*/qt4/plugins/script/libqtscript_uitools.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_uitools.so.1.0.0 debian/libqtscript4-doc.doc-base0000644000000000000000000000045611747765613014002 0ustar Document: qtscript4-qtbindings-api Title: Qt Script Qt Bindings Reference Documentation Abstract: Qt Bindings API documentation for Qt Script programmers Section: Programming/QtScript Format: HTML Index: /usr/share/doc/libqtscript4-doc/api/index.html Files: /usr/share/doc/libqtscript4-doc/api/*.html debian/qtscript-tools.install0000644000000000000000000000004511747775461013607 0ustar usr/bin/qs_generator usr/bin/qs_eval debian/rules0000755000000000000000000000224611750010767010256 0ustar #!/usr/bin/make -f # DEB_BUILD_OPTIONS noopt ifeq (noopt,$(filter noopt,$(DEB_BUILD_OPTIONS))) QMAKE_TARGET := debug else QMAKE_TARGET := release endif export QMAKE_TARGET BUILDDIR := obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) NON_BINDINGS_PACKAGES := libqtscript4-qtbindings qtscript-tools libqtscript4-doc MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh $@ --parallel override_dh_auto_build: dh_auto_build -- BUILDDIR=$(BUILDDIR) override_dh_auto_install: install -d debian/tmp/usr/lib/$(MULTIARCH)/qt4 cp -a $(BUILDDIR)/plugins debian/tmp/usr/lib/$(MULTIARCH)/qt4/ install -D $(BUILDDIR)/generator/generator debian/tmp/usr/bin/qs_generator install -D $(BUILDDIR)/qtbindings/qs_eval/qs_eval debian/tmp/usr/bin/qs_eval override_dh_auto_clean: dh_auto_clean -- BUILDDIR=$(BUILDDIR) if [ -d "$(BUILDDIR)" ]; then find $(BUILDDIR) -type d -empty -delete; fi override_dh_makeshlibs: # Run with --noscripts on bindings packages dh_makeshlibs --noscripts $(patsubst %,-N%,$(NON_BINDINGS_PACKAGES)) # Run normally on the rest dh_makeshlibs --remaining-packages .PHONY: override_dh_auto_build override_dh_auto_install override_dh_auto_clean debian/README.source0000644000000000000000000000303411747765613011366 0ustar This package uses git+topgit as the packaging VCS. Please install Debian topgit package 0.5 or higher and read /usr/share/doc/topgit/HOWTO-tg2quilt.gz for more information how to checkout, add, remove, modify patches (topic branches) and do other common tasks. Branch structure of the repository is as follows: * upstream - upstream source code. * master - the Debianization branch (upstream source and debian directory). This branch also contains exported debian/patches ready for building. Topic branches should be named as follows: * general/* - namespace for general upstream patches. Patches can be named freely, but it is recommended to suffix names with '_fix' for patches fixing bugs and with '_feature' for patches introducing new features. These patches should be based on the upstream branch. * debian/* - Debian specific patches should be put in this namespace. These patches should be based on the upstream branch or even master branch if necessary. If a patch depends on any other patch(es), create/adjust its topic branch dependencies as needed. However, topgit is not a build dependency. Patches are exported to debian/patches as quilt series before building. Please read /usr/share/doc/quilt/README.source (quilt version 0.46-4.1 or later) for more information on how to manage patches directly with quilt. Please note that this method is not acceptable for long term package management, only for quick patching. debian/libqtscript4-doc.examples0000644000000000000000000000001311747765613014130 0ustar examples/* debian/copyright0000644000000000000000000000560311747765613011146 0ustar This package was debianized by Modestas Vainius on Sat, 06 Mar 2009 18:40:13 +0200 It was downloaded from: http://code.google.com/p/qtscriptgenerator/downloads/list The project homepages are: http://code.google.com/p/qtscriptgenerator/ http://labs.trolltech.com/page/Projects/QtScript/Generator Upstream Authors: Trolltech ASA Roberto Raggi Debian packaging (debian/*) is: Copyright: © 2009 Modestas Vainius License: GNU General Public License, version 2 or later (GPL-2+) On Debian systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2. Upstream Copyright Holders: Copyright: © Trolltech ASA. All Rights Reserved. Credited: 108 times Years: 1992-2008 Used-Licenses: GPL-2 Copyrighted-Files-Count: 107 Copyrighted-Files: generator/* generator/parser/* generator/parser/include/* generator/parser/rpp/* qtbindings/qs_eval/* qtbindings/qtscript_core/* tools/qsexec/src/* Copyright: © Roberto Raggi Credited: 54 times Years: 2002-2006 Used-Licenses: GPL-2 Copyrighted-Files-Count: 54 Copyrighted-Files: generator/parser/* excluding: - generator/parser/rpp-allocator.h generator/parser/rpp/* excluding: - generator/parser/rpp/builtin-macros.cpp - generator/parser/rpp/preprocessor.cpp - generator/parser/rpp/preprocessor.h Copyright: © Harald Fernengel Credited: 2 times Years: 2005 Used-Licenses: GPL-2 Copyrighted-Files-Count: 2 Copyrighted-Files: generator/parser/rpp/preprocessor.cpp generator/parser/rpp/preprocessor.h License for all components is: -- GNU General Public License, version 2 (GPL-2) | This file is part of the Qt Script Generator project on Trolltech Labs. | | This file may be used under the terms of the GNU General Public | License version 2.0 as published by the Free Software Foundation | and appearing in the file LICENSE.GPL included in the packaging of | this file. Please review the following information to ensure GNU | General Public Licensing requirements will be met: | http://www.trolltech.com/products/qt/opensource.html | | If you are unsure which license is appropriate for your use, please | review the following information: | http://www.trolltech.com/products/qt/licensing.html or contact the | sales department at sales@trolltech.com. | | This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. On Debian systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2 -- Plugins at /usr/lib/qt4/plugins/script/* are derivatives of Qt and are licensed under the same terms as Qt. See /usr/share/doc/libqtcore4/copyright for more information. debian/libqtscript4-doc.install0000644000000000000000000000013611747775461013770 0ustar obj-*/doc/* usr/share/doc/libqtscript4-doc/api doc/* usr/share/doc/libqtscript4-doc/api debian/patches/0000755000000000000000000000000011750011264010612 5ustar debian/patches/upstream_memory_alignment_fix.diff0000644000000000000000000000745411747765613017636 0ustar From: Modestas Vainius Subject: [PATCH] Memory alignment fixes Fixes various memory alignment issues which cause generator to crash on alignment-sensitive architectures. Signed-off-by: Modestas Vainius --- generator/parser/ast.h | 2 +- generator/parser/list.h | 2 +- generator/parser/rpp/pp-symbol.h | 9 +++++++-- generator/parser/rxx_allocator.h | 17 +++++++++++++++++ generator/parser/smallobject.h | 6 ++++++ 5 files changed, 32 insertions(+), 4 deletions(-) --- a/generator/parser/ast.h +++ b/generator/parser/ast.h @@ -880,7 +880,7 @@ struct QEnumsAST : public DeclarationAST template _Tp *CreateNode(pool *memory_pool) { - _Tp *node = reinterpret_cast<_Tp*>(memory_pool->allocate(sizeof(_Tp))); + _Tp *node = reinterpret_cast<_Tp*>(memory_pool->allocate(sizeof(_Tp), strideof(_Tp))); node->kind = _Tp::__node_kind; return node; } --- a/generator/parser/list.h +++ b/generator/parser/list.h @@ -54,7 +54,7 @@ struct ListNode static ListNode *create(const Tp &element, pool *p) { - ListNode *node = new (p->allocate(sizeof(ListNode))) ListNode(); + ListNode *node = new (p->allocate(sizeof(ListNode), strideof(ListNode))) ListNode(); node->element = element; node->index = 0; node->next = node; --- a/generator/parser/rpp/pp-symbol.h +++ b/generator/parser/rpp/pp-symbol.h @@ -51,6 +51,11 @@ class pp_symbol static rxx_allocator__allocator; return __allocator; } + static rxx_allocator &ppfs_allocator_instance () + { + static rxx_allocator__ppfs_allocator; + return __ppfs_allocator; + } public: static int &N() @@ -66,7 +71,7 @@ public: memcpy(data, __data, __size); data[__size] = '\0'; - char *where = allocator_instance ().allocate (sizeof (pp_fast_string)); + pp_fast_string *where = ppfs_allocator_instance ().allocate (sizeof (pp_fast_string)); return new (where) pp_fast_string (data, __size); } @@ -86,7 +91,7 @@ public: std::copy (__first, __last, data); data[__size] = '\0'; - char *where = allocator_instance ().allocate (sizeof (pp_fast_string)); + pp_fast_string *where = ppfs_allocator_instance ().allocate (sizeof (pp_fast_string)); return new (where) pp_fast_string (data, __size); } --- a/generator/parser/rxx_allocator.h +++ b/generator/parser/rxx_allocator.h @@ -48,6 +48,17 @@ #include #include +// Stride calculation +template +struct Tchar { + T t; + char c; +}; + +#define strideof(T) \ + ((sizeof(Tchar) > sizeof(T)) ? \ + sizeof(Tchar)-sizeof(T) : sizeof(T)) + template class rxx_allocator { public: typedef _Tp value_type; @@ -106,6 +117,12 @@ public: return p; } + pointer allocate(size_type __n, size_type stride, const void* = 0) { + if (reinterpret_cast(_M_current_block + _M_current_index) % stride > 0) + _M_current_index += stride - reinterpret_cast(_M_current_block + _M_current_index) % stride; + return allocate(__n); + } + void deallocate(pointer __p, size_type __n) {} size_type max_size() const { return size_type(-1) / sizeof(_Tp); } --- a/generator/parser/smallobject.h +++ b/generator/parser/smallobject.h @@ -52,6 +52,7 @@ class pool public: inline void *allocate(std::size_t __size); + inline void *allocate(std::size_t __size, std::size_t __stride); }; inline void *pool::allocate(std::size_t __size) @@ -59,6 +60,11 @@ inline void *pool::allocate(std::size_t return __alloc.allocate(__size); } +inline void *pool::allocate(std::size_t __size, std::size_t __stride) +{ + return __alloc.allocate(__size, __stride); +} + #endif // kate: space-indent on; indent-width 2; replace-tabs on; debian/patches/debian_simple_top_makefile.diff0000644000000000000000000000422111747765613017001 0ustar From: Modestas Vainius Subject: [PATCH] debian/simple_top_makefile Last-Update: 2011-04-23 Add a simple Makefile to the top level directory which implements most README steps. Some stuff might be Debian specific in here. Signed-off-by: Modestas Vainius --- Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) --- /dev/null +++ b/Makefile @@ -0,0 +1,43 @@ +BUILDDIR := . +GENERATOR := $(BUILDDIR)/generator/generator +CXXFLAGS ?= +GENERATED_CPP_DONE = $(BUILDDIR)/generated_cpp/done +QTBINDINGS_DONE = $(BUILDDIR)/qtbindings/done + +##### Build generator and QtScript Bindings ##### +all: build + +$(BUILDDIR) $(BUILDDIR)/generator $(BUILDDIR)/qtbindings: + mkdir -p $@ + +## Build generator ## +$(BUILDDIR)/generator/Makefile: $(CURDIR)/generator/generator.pro | $(BUILDDIR)/generator + cd $(BUILDDIR)/generator && qmake-qt4 QMAKE_CXXFLAGS="$(CXXFLAGS)" $(CURDIR)/generator/generator.pro + +$(GENERATOR): $(BUILDDIR)/generator/Makefile + $(MAKE) -C $(BUILDDIR)/generator $(QMAKE_TARGET) + touch $@ + +## Generate bindings CPP files ## +$(GENERATED_CPP_DONE): $(GENERATOR) $(wildcard generator/typesystem_*.xml) + cd generator && QTDIR=/usr/include/qt4 $(CURDIR)/$(GENERATOR) --include-paths=/usr/include/qt4 --output-directory=$(CURDIR)/$(BUILDDIR) + touch $@ + +## Build qtbindings ## +$(BUILDDIR)/qtbindings/Makefile: $(GENERATED_CPP_DONE) $(CURDIR)/qtbindings/qtbindings.pro | $(BUILDDIR)/qtbindings + cd $(BUILDDIR)/qtbindings && qmake-qt4 QMAKE_CXXFLAGS="$(CXXFLAGS)" $(CURDIR)/qtbindings/qtbindings.pro + +$(QTBINDINGS_DONE): $(BUILDDIR)/qtbindings/Makefile + $(MAKE) -C $(BUILDDIR)/qtbindings + touch $@ + +build: $(QTBINDINGS_DONE) + +clean distclean: + if [ -f "$(BUILDDIR)/qtbindings/Makefile" ]; then rm -f $(GENERATED_CPP_DONE); $(MAKE) -C $(BUILDDIR)/qtbindings $@; fi + if [ -f "$(BUILDDIR)/generator/Makefile" ]; then rm -f $(QTBINDINGS_DONE); $(MAKE) -C $(BUILDDIR)/generator $@; fi + rm -rf $(BUILDDIR)/generated_cpp $(BUILDDIR)/plugins + rm -f $(BUILDDIR)/doc/*.html + rm -f generator/.preprocessed.tmp generator/mjb_rejected_*.log + +.PHONY: clean distclean build debian/patches/series0000644000000000000000000000045311750011172012027 0ustar debian_drop_extra_linkage_fix.diff debian_qs_eval_globalize.diff debian_simple_top_makefile.diff debian_support_out_of_source_tree_build.diff upstream_memory_alignment_fix.diff debian_webkit_phonon_include.diff upstream_support_later_phonon.diff upstream_arm_fix_ftbfs.diff upstream_gcc4.7_fix.diff debian/patches/debian_drop_extra_linkage_fix.diff0000644000000000000000000000350611747765613017505 0ustar From: Modestas Vainius Subject: [PATCH] Reduce excess linkage Do not link to unnecessary libraries. Signed-off-by: Modestas Vainius --- qtbindings/qtbindingsbase.pri | 2 ++ qtbindings/qtscript_core/qtscript_core.pro | 2 ++ qtbindings/qtscript_uitools/qtscript_uitools.pro | 2 ++ .../qtscript_xmlpatterns/qtscript_xmlpatterns.pro | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) --- a/qtbindings/qtbindingsbase.pri +++ b/qtbindings/qtbindingsbase.pri @@ -6,3 +6,5 @@ QT += script CONFIG += debug_and_release GENERATEDCPP = $$PWD/../generated_cpp TARGET=$$qtLibraryTarget($$TARGET) +QMAKE_LIBS_THREAD = +QMAKE_LIBS_OPENGL = --- a/qtbindings/qtscript_core/qtscript_core.pro +++ b/qtbindings/qtscript_core/qtscript_core.pro @@ -1,4 +1,6 @@ TARGET = qtscript_core include(../qtbindingsbase.pri) +qt:load(qt) +LIBS -= -lQtGui SOURCES += $$GENERATEDCPP/com_trolltech_qt_core/plugin.cpp include($$GENERATEDCPP/com_trolltech_qt_core/com_trolltech_qt_core.pri) --- a/qtbindings/qtscript_uitools/qtscript_uitools.pro +++ b/qtbindings/qtscript_uitools/qtscript_uitools.pro @@ -1,5 +1,7 @@ TARGET = qtscript_uitools include(../qtbindingsbase.pri) CONFIG += uitools +QT -= xml +qt:load(qt) SOURCES += $$GENERATEDCPP/com_trolltech_qt_uitools/plugin.cpp include($$GENERATEDCPP/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri) --- a/qtbindings/qtscript_xmlpatterns/qtscript_xmlpatterns.pro +++ b/qtbindings/qtscript_xmlpatterns/qtscript_xmlpatterns.pro @@ -2,5 +2,7 @@ TARGET = qtscript_xmlpatterns include(../qtbindingsbase.pri) QT -= gui QT += xmlpatterns network +qt:load(qt) +LIBS -= -lQtNetwork SOURCES += $$GENERATEDCPP/com_trolltech_qt_xmlpatterns/plugin.cpp include($$GENERATEDCPP/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri) debian/patches/debian_webkit_phonon_include.diff0000644000000000000000000000107011747765613017341 0ustar Description: Include QtWebkit and Phonon unconditionally. This is necessary as both aren't built by the Qt source. Author: Felix Geyer Acked-By: Modestas Vainius Last-Update: 2011-03-20 --- a/generator/qtscript_masterinclude.h +++ b/generator/qtscript_masterinclude.h @@ -53,13 +53,9 @@ # include #endif -#ifndef QT_NO_WEBKIT # include -#endif -#ifndef QT_NO_PHONON # include -#endif #include "../qtbindings/qtscript_core/qtscriptconcurrent.h" debian/patches/upstream_gcc4.7_fix.diff0000644000000000000000000000160311750011172015215 0ustar From: Modestas Vainius Subject: Fix FTBFS with gcc 4.7 Origin: vendor Fixes the following FTBFS with gcc 4.7: ../../generator/reporthandler.cpp: In static member function 'static void ReportHandler::warning(const QString&)': ../../generator/reporthandler.cpp:60:62: error: format not a string literal and no format arguments [-Werror=format-security] cc1plus: some warnings being treated as errors make[4]: *** [release/reporthandler.o] Error 1 --- a/generator/reporthandler.cpp +++ b/generator/reporthandler.cpp @@ -57,7 +57,7 @@ void ReportHandler::warning(const QStrin if (db && db->isSuppressedWarning(warningText)) { ++m_suppressed_count; } else if (!m_reported_warnings.contains(warningText)) { - qDebug(qPrintable(warningText)); + qDebug() << warningText; ++m_warning_count; m_reported_warnings.insert(warningText); debian/patches/upstream_support_later_phonon.diff0000644000000000000000000000254311750007736017665 0ustar From: Modestas Vainius From: Felix Geyer Subject: Fix building against system Phonon up to and including 4.6.0 Forwarded: no Origin: vendor Last-Update: 2012-03-06 --- a/generator/typesystem_phonon-common.xml +++ b/generator/typesystem_phonon-common.xml @@ -101,6 +101,7 @@ + --- a/generator/typesystem_phonon.xml +++ b/generator/typesystem_phonon.xml @@ -128,6 +128,7 @@ + debian/patches/debian_qs_eval_globalize.diff0000644000000000000000000000410311747765613016452 0ustar From: Modestas Vainius Subject: [PATCH] debian/qs_eval_globalize Disable qs_eval code which tries to load locally built plugins. Signed-off-by: Modestas Vainius --- qtbindings/qs_eval/main.cpp | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- a/qtbindings/qs_eval/main.cpp +++ b/qtbindings/qs_eval/main.cpp @@ -142,6 +142,7 @@ int main(int argc, char *argv[]) else app = new QApplication(argc, argv); +#if 0 QDir dir(QApplication::applicationDirPath()); if (dir.dirName() == QLatin1String("debug") || dir.dirName() == QLatin1String("release")) dir.cdUp(); @@ -154,6 +155,7 @@ int main(int argc, char *argv[]) QStringList paths = app->libraryPaths(); paths << dir.absolutePath(); app->setLibraryPaths(paths); +#endif QScriptEngine *eng = new QScriptEngine(); @@ -177,17 +179,15 @@ int main(int argc, char *argv[]) if (!failExtensions.isEmpty()) { if (failExtensions.size() == extensions.size()) { qWarning("Failed to import Qt bindings!\n" - "Plugins directory searched: %s/script\n" - "Make sure that the bindings have been built, " + "Make sure that the bindings have been installed, " "and that this executable and the plugins are " - "using compatible Qt libraries.", qPrintable(dir.absolutePath())); + "using compatible Qt libraries."); } else { qWarning("Failed to import some Qt bindings: %s\n" - "Plugins directory searched: %s/script\n" - "Make sure that the bindings have been built, " + "Make sure that the bindings have been installed, " "and that this executable and the plugins are " "using compatible Qt libraries.", - qPrintable(failExtensions.join(", ")), qPrintable(dir.absolutePath())); + qPrintable(failExtensions.join(", "))); } } debian/patches/upstream_arm_fix_ftbfs.diff0000644000000000000000000000405111747765613016221 0ustar From: Modestas Vainius Subject: Fix FBTFS on arm* Last-Update: 2011-04-24 Forwarded: no generator gets the signature of QEasingCurve::setCustomType() wrong. What is more, qreal is involved in the signature. qreal is float on arm* so exclude setCustomType(float) methods as well. --- a/generator/typesystem_core-common.xml +++ b/generator/typesystem_core-common.xml @@ -921,6 +921,7 @@ + --- a/generator/typesystem_core.xml +++ b/generator/typesystem_core.xml @@ -1388,14 +1388,12 @@ - - - + --- a/generator/typesystem_core-qtscript.xml +++ b/generator/typesystem_core-qtscript.xml @@ -1447,6 +1447,7 @@ + debian/patches/debian_support_out_of_source_tree_build.diff0000644000000000000000000000142211747765613021636 0ustar From: Modestas Vainius Subject: [PATCH] debian/support_out_of_source_tree_build Modify paths in qtbindings/qtbindingsbase.pri to support generated_cpp in the builddir. Also output plugins to the builddir. Signed-off-by: Modestas Vainius --- qtbindings/qtbindingsbase.pri | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- a/qtbindings/qtbindingsbase.pri +++ b/qtbindings/qtbindingsbase.pri @@ -1,10 +1,10 @@ TEMPLATE = lib DEPENDPATH += . INCLUDEPATH += . -DESTDIR = $$PWD/../plugins/script +DESTDIR = ../../plugins/script QT += script CONFIG += debug_and_release -GENERATEDCPP = $$PWD/../generated_cpp +GENERATEDCPP = ../../generated_cpp TARGET=$$qtLibraryTarget($$TARGET) QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = debian/libqtscript4-phonon.install0000644000000000000000000000033011750010031014461 0ustar usr/lib/*/qt4/plugins/script/libqtscript_phonon.so usr/lib/*/qt4/plugins/script/libqtscript_phonon.so.1 usr/lib/*/qt4/plugins/script/libqtscript_phonon.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_phonon.so.1.0.0 debian/libqtscript4-core.install0000644000000000000000000000032011750010031014107 0ustar usr/lib/*/qt4/plugins/script/libqtscript_core.so usr/lib/*/qt4/plugins/script/libqtscript_core.so.1 usr/lib/*/qt4/plugins/script/libqtscript_core.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_core.so.1.0.0 debian/libqtscript4-network.install0000644000000000000000000000033411750010031014655 0ustar usr/lib/*/qt4/plugins/script/libqtscript_network.so usr/lib/*/qt4/plugins/script/libqtscript_network.so.1 usr/lib/*/qt4/plugins/script/libqtscript_network.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_network.so.1.0.0 debian/libqtscript4-gui.install0000644000000000000000000000031411750010031013746 0ustar usr/lib/*/qt4/plugins/script/libqtscript_gui.so usr/lib/*/qt4/plugins/script/libqtscript_gui.so.1 usr/lib/*/qt4/plugins/script/libqtscript_gui.so.1.0 usr/lib/*/qt4/plugins/script/libqtscript_gui.so.1.0.0 debian/source/0000755000000000000000000000000011747765613010507 5ustar debian/source/format0000644000000000000000000000001411747765613011715 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000000766711750012027011053 0ustar qtscriptgenerator (0.2.0-1) unstable; urgency=low * New upstream release. * Update upstream_support_later_phonon.diff patch to support Phonon 4.6. Thanks to Felix Geyer. (Closes: #662771) * Bump debhelper compat level to 9 in order to gain build flag support. * Remove custom build flag management code from debian/rules. * Bump Standards-Version to 3.9.3: no changes needed. * Add multi-arch support: - build depend on multi-arch aware Qt 4.8.0; - switch libqtscript4-qtbindings to Architecture:any and mark it Multi-Arch:same; - mark all bindings package Multi-Arch: same and add to ${misc:Pre-Depends} to their Pre-Depends. - install plugins into multiarch path (/usr/lib//qt4/). * Fix package descriptions. Thanks to Martin Eberhard Schauer for the patch. (Closes: #634171) * Fix FTBFS with gcc 4.7 (patch upstream_gcc4.7_fix.diff). -- Modestas Vainius Tue, 01 May 2012 19:49:21 +0300 qtscriptgenerator (0.1.0+git20101026+8b191fbc-2) unstable; urgency=low * debian_simple_top_makefile.diff: make generated_cpp depend on typesystem xml files. * Add upstream_arm_fix_ftbfs.diff patch to fix FTBFS on arm* architectures. -- Modestas Vainius Sun, 24 Apr 2011 16:39:27 +0300 qtscriptgenerator (0.1.0+git20101026+8b191fbc-1) unstable; urgency=low * New upstream development snapshot to support Qt 4.7. * Remove DMUA field from debian/control. I'm a DD now. * Switch my e-mail address to @debian.org one. * Git repository moved to my new DD account on alioth. Change Vcs fields in debian/control accordingly. * Build depend on libqtwebkit-dev | libqt4-dev (<< 4:4.7.0). Also steal debian_webkit_phonon_include.diff from kubuntu to enable building with Qt 4.7. Fixes FTBFS. (Closes: #618172) * Drop topgit support. * Move patches out of subdirectories. * Switch source package to 3.0 (quilt). * Bump Standards-Version to 3.9.2: no changes needed. * Drop upstream_gcc4.4_ftbfs_fix.diff, merged upstream. * Adapt debian_drop_extra_linkage_fix.diff to upstream changes. * Add patch upstream_support_later_phonon.diff which fixes building against system Phonon 4.5.0. * Reimplement top Makefile in the parallel-safe manner (patch debian_simple_top_makefile.diff) and pass --parallel to dh. * Add doc-base control file for libqtscript4-doc. -- Modestas Vainius Sat, 23 Apr 2011 22:32:16 +0300 qtscriptgenerator (0.1.0-3) unstable; urgency=low * Fix noopt check. * Export QMAKE_TARGET. * Use dh_makeshlibs --remaining-packages instead of the previous hack, hence depend on debhelper 7.2.7. * Bump Standards-Version to 3.8.1. No changes needed. * New patches: - general/memory_alignment_fix.diff - some unaligned memory fixes. It should fix FTBFS on armel/sparc (Closes: #525980). - general/gcc4.4_ftbfs_fix.diff - fixes FTBFS with gcc 4.4 (Closes: #526167). - debian/drop_extra_linkage_fix - do not link with unnecessary libraries. * Use new quilt dh sequence module, build depend on quilt (>= 0.46-7~). * Backports friendly debhelper build dependency versioning. * Update debian/README.source: build branch merged into master. * Improve simple_top_makefile patch: - build process depends on existance of plugins; - update timestamps whenever possible to avoid unnecessary rebuilds. -- Modestas Vainius Sat, 09 May 2009 18:22:41 +0300 qtscriptgenerator (0.1.0-2) unstable; urgency=low * Reenable libqtscript4-phonon, build depend on Qt 4.5. * Add notice about Qt 4.5 copyright to debian/copyright. -- Modestas Vainius Sat, 25 Apr 2009 16:16:02 +0300 qtscriptgenerator (0.1.0-1) unstable; urgency=low * Initial release (Closes: #518601). * libqtscript4-phonon is empty on purpose until the package is built against Qt 4.5 which is going to be soon. -- Modestas Vainius Sat, 07 Mar 2009 14:19:20 +0200