rpms/qt-creator/devel disable_private_header_check.patch, NONE, 1.1 enable-signal-slot.patch, NONE, 1.1 import.log, NONE, 1.1 no-docu.diff, NONE, 1.1 pluginPaths.patch, NONE, 1.1 qt-creator.spec, NONE, 1.1 qtcreator-qworkbenchlibrary_lib64.patch, NONE, 1.1 qtcreator-qworkbenchplugin_lib64.patch, NONE, 1.1 qtcreator.desktop, NONE, 1.1 qtcreator_rpath.patch, NONE, 1.1 qtdoc3_location.patch, NONE, 1.1 qworkbench_lib64.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Itamar Reis Peixoto
itamarjp at fedoraproject.org
Sun Apr 5 03:06:13 UTC 2009
Author: itamarjp
Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4889/devel
Modified Files:
.cvsignore sources
Added Files:
disable_private_header_check.patch enable-signal-slot.patch
import.log no-docu.diff pluginPaths.patch qt-creator.spec
qtcreator-qworkbenchlibrary_lib64.patch
qtcreator-qworkbenchplugin_lib64.patch qtcreator.desktop
qtcreator_rpath.patch qtdoc3_location.patch
qworkbench_lib64.patch
Log Message:
qt-creator 1.0
disable_private_header_check.patch:
--- NEW FILE disable_private_header_check.patch ---
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 02edb9d..b96bb50 100644
--- a/src/plugins/plugins.pro
+++ src/plugins/plugins.pro
@@ -26,15 +26,9 @@ SUBDIRS = plugin_coreplugin \
plugin_qtscripteditor \
# plugin_cpaster \
plugin_cmakeprojectmanager \
- plugin_fakevim
-
-# These two plugins require private headers from Qt and therefore don't work
-# with an installed/released version of Qt.
-exists($$(QTDIR)/.qmake.cache) {
- SUBDIRS += plugin_designer plugin_resourceeditor
-} else {
- message(Designer and Resource Editor plugins are not build! They require private headers and do not compile with your released/installed version of Qt)
-}
+ plugin_fakevim \
+ plugin_designer \
+ plugin_resourceeditor
plugin_coreplugin.subdir = coreplugin
enable-signal-slot.patch:
--- NEW FILE enable-signal-slot.patch ---
*** src/plugins/designer/editorwidget.cpp.old 2009-03-18 20:21:01.000000000 -0300
--- src/plugins/designer/editorwidget.cpp 2009-03-18 20:21:24.000000000 -0300
*************** using namespace Designer::Constants;
*** 41,47 ****
enum { ActionEditorTab, SignalSlotEditorTab };
! enum { wantSignalSlotEditor = 0 };
namespace Designer {
namespace Internal {
--- 41,47 ----
enum { ActionEditorTab, SignalSlotEditorTab };
! enum { wantSignalSlotEditor = 1 };
namespace Designer {
namespace Internal {
--- NEW FILE import.log ---
qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
no-docu.diff:
--- NEW FILE no-docu.diff ---
--- qtcreator.pro
+++ qtcreator.pro
@@ -5,7 +5,6 @@ count(TOO_OLD_LIST, 1) {
error("Use at least Qt 4.5.")
}
-include(doc/doc.pri)
TEMPLATE = subdirs
CONFIG += ordered
pluginPaths.patch:
--- NEW FILE pluginPaths.patch ---
--- src/app/main.cpp.old 2009-03-18 20:15:43.000000000 -0300
+++ src/app/main.cpp 2009-03-18 21:00:27.000000000 -0300
@@ -179,7 +179,7 @@ static inline QStringList getPluginPaths
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
- pluginPath += QLatin1String("lib");
+ pluginPath += QLatin1String("lib64");
pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
--- NEW FILE qt-creator.spec ---
Name: qt-creator
Version: 1.0.0
Release: 4%{?dist}
Summary: Lightweight and cross-platform IDE for Qt
Group: Development/Tools
License: LGPLv2 with exceptions
URL: http://www.qtsoftware.com/developer/qt-creator
Source0: http://download.qtsoftware.com/qtcreator/%name-%version-src.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: qtcreator.desktop
#make ui editor works
#patch from http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff;h=f3f20d96bdfb5266cc25ac91ae0def8a33875a81
Patch0: disable_private_header_check.patch
#fix qdoc3 executable location in fedora
Patch1: qtdoc3_location.patch
#make it install into lib64
Patch2: qtcreator-qworkbenchlibrary_lib64.patch
Patch3: qtcreator-qworkbenchplugin_lib64.patch
Patch4: qworkbench_lib64.patch
Patch5: qtcreator_rpath.patch
#enable signal/slot editor http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff_plain;h=bf118eba1ee1f5b6e19c6f29cd7d114c121a20ef
Patch6: enable-signal-slot.patch
#search for plugins in lib64 dir
Patch7: pluginPaths.patch
#temporary disabled docs
Patch8: no-docu.diff
BuildRequires: qt4-devel >= 4.5.0
%description
Qt Creator (previously known as Project Greenhouse) is a new,
lightweight, cross-platform integrated development environment (IDE)
designed to make development with the Qt application framework
even faster and easier.
%prep
%setup -q -n %name-%version-src
%patch0 -p0
%patch1 -p0
#make it install into lib64
%if "%{_lib}" == "lib64"
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch7 -p0
%endif
%patch6 -p0
%patch8 -p0
%build
QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
qmake-qt4
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
desktop-file-install \
--add-category="Development" \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
%{_bindir}/qtcreator
%{_libdir}/qtcreator
%{_datadir}/qtcreator
%{_datadir}/pixmaps/qtcreator_logo_*.png
%{_datadir}/applications/qtcreator.desktop
%changelog
* Tue Mar 20 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-4
- fix lib's loading in 64 bit machines
* Tue Mar 18 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-3
- Changed License to LGPLv2 with exceptions and BR to qt4-devel >= 4.5.0
* Tue Mar 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-2
- Improved Version to make it more compatible with fedora guidelines
* Sun Mar 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-1
- initial RPM release
qtcreator-qworkbenchlibrary_lib64.patch:
--- NEW FILE qtcreator-qworkbenchlibrary_lib64.patch ---
--- src/qworkbenchlibrary.pri.old 2009-03-16 23:35:01.000000000 -0300
+++ src/qworkbenchlibrary.pri 2009-03-16 23:35:29.000000000 -0300
@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* {
- target.path = /lib/qtcreator
+ target.path = /lib64/qtcreator
INSTALLS += target
}
qtcreator-qworkbenchplugin_lib64.patch:
--- NEW FILE qtcreator-qworkbenchplugin_lib64.patch ---
--- src/qworkbenchplugin.pri.old 2009-03-17 20:39:56.000000000 -0300
+++ src/qworkbenchplugin.pri 2009-03-17 20:40:38.000000000 -0300
@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONF
CONFIG += plugin plugin_with_soname
linux-* {
- target.path = /lib/qtcreator/plugins/$$PROVIDER
+ target.path = /lib64/qtcreator/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec
- pluginspec.path = /lib/qtcreator/plugins/$$PROVIDER
+ pluginspec.path = /lib64/qtcreator/plugins/$$PROVIDER
INSTALLS += target pluginspec
}
--- NEW FILE qtcreator.desktop ---
[Desktop Entry]
Type=Application
Exec=qtcreator %F
Name=Qt Creator
GenericName=C++ IDE for developing Qt applications
X-KDE-StartupNotify=true
Icon=Nokia-QtCreator
Terminal=false
Categories=Development;IDE;Qt;
MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
qtcreator_rpath.patch:
--- NEW FILE qtcreator_rpath.patch ---
--- src/rpath.pri.old 2009-03-17 20:37:28.000000000 -0300
+++ src/rpath.pri 2009-03-17 20:38:08.000000000 -0300
@@ -3,7 +3,7 @@ macx {
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib/qtcreator
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib64/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
qtdoc3_location.patch:
--- NEW FILE qtdoc3_location.patch ---
--- doc/doc.pri.old 2009-03-16 23:04:19.000000000 -0300
+++ doc/doc.pri 2009-03-16 23:04:59.000000000 -0300
@@ -1,5 +1,5 @@
unix {
- QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
+ QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/bin/qdoc3
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
} else {
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
qworkbench_lib64.patch:
--- NEW FILE qworkbench_lib64.patch ---
--- src/qworkbench.pri.old 2009-03-18 19:33:33.000000000 -0300
+++ src/qworkbench.pri 2009-03-18 19:34:09.000000000 -0300
@@ -21,7 +21,7 @@ macx {
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
IDE_APP_TARGET = qtcreator
- IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib/qtcreator
+ IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib64/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Mar 2009 20:19:58 -0000 1.1
+++ .cvsignore 5 Apr 2009 03:06:11 -0000 1.2
@@ -0,0 +1 @@
+qt-creator-1.0.0-src.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Mar 2009 20:19:58 -0000 1.1
+++ sources 5 Apr 2009 03:06:12 -0000 1.2
@@ -0,0 +1 @@
+5478124035d80a90e66a3db67ab4477a qt-creator-1.0.0-src.zip
More information about the scm-commits
mailing list