rpms/kdebindings/devel kdebindings-qyoto-examples.patch, NONE, 1.1 kdebindings-qyoto-includes.patch, NONE, 1.1 kdebindings.spec, 1.180, 1.181
Ben Boeckel
mathstuf at fedoraproject.org
Fri Mar 20 17:11:47 UTC 2009
Author: mathstuf
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14486
Modified Files:
kdebindings.spec
Added Files:
kdebindings-qyoto-examples.patch
kdebindings-qyoto-includes.patch
Log Message:
Enabled PHP and C# bindings and cleaned up conditionals
kdebindings-qyoto-examples.patch:
--- NEW FILE kdebindings-qyoto-examples.patch ---
diff -U 5 -r csharp/plasma/CMakeLists.txt csharp/plasma/CMakeLists.txt
--- csharp/plasma/CMakeLists.txt 2008-12-10 11:12:50.000000000 -0500
+++ csharp/plasma/CMakeLists.txt 2009-03-19 23:47:56.000000000 -0400
@@ -2,11 +2,11 @@
IF (NOT QT4_FOUND)
FIND_PACKAGE(Qt4 REQUIRED)
ENDIF (NOT QT4_FOUND)
-add_subdirectory( examples )
+# add_subdirectory( examples )
SET(SRC_CPP src/plasma.cpp src/plasmahandlers.cpp)
SET(SRC_CS src/AssemblyInfo.cs
src/PlasmaScripting_DataEngine.cs
kdebindings-qyoto-includes.patch:
--- NEW FILE kdebindings-qyoto-includes.patch ---
diff -r -U 5 csharp/kimono/src/marshall_macros_kde.h csharp/kimono/src/marshall_macros_kde.h
--- csharp/kimono/src/marshall_macros_kde.h 2008-11-28 10:33:04.000000000 -0500
+++ csharp/kimono/src/marshall_macros_kde.h 2009-03-17 00:40:26.000000000 -0400
@@ -1,6 +1,7 @@
#include <ksharedptr.h>
+#include <cstdio>
template<class Item, const char *ItemSTR>
void marshall_KSharedPtr(Marshall *m) {
switch(m->action()) {
case Marshall::FromObject:
diff -r -U 5 csharp/qyoto/src/qyotosmokebinding.cpp csharp/qyoto/src/qyotosmokebinding.cpp
--- csharp/qyoto/src/qyotosmokebinding.cpp 2009-01-06 12:19:24.000000000 -0500
+++ csharp/qyoto/src/qyotosmokebinding.cpp 2009-03-16 23:46:55.000000000 -0400
@@ -11,16 +11,16 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
-#include <stdlib.h>
#include "qyotosmokebinding.h"
#include "qyoto.h"
#include "virtualmethodcall.h"
#include <cstdlib>
+#include <cstdio>
#include <qt_smoke.h>
#if QT_VERSION >= 0x40200
#include <QVariant>
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kdebindings.spec 18 Mar 2009 13:18:44 -0000 1.180
+++ kdebindings.spec 20 Mar 2009 17:11:16 -0000 1.181
@@ -1,11 +1,10 @@
-# FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support?
-
# define to enable these optional bits
-#define csharp 1
+%define csharp 1
%define falcon 1
-#define php 1
+%define php 1
%define ruby 1
%define smoke 1
+%define java 0
%define pykde4_akonadi 1
%define pyqt4_version 4.4.4
@@ -22,7 +21,7 @@
Name: kdebindings
Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: KDE bindings to non-C++ languages
Group: User Interface/Desktops
@@ -30,28 +29,51 @@
URL: http://developer.kde.org/language-bindings/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# patch to disable examples (trouble with them installing to the buildroot)
+Patch0: kdebindings-qyoto-examples.patch
# upstream patches
+Patch99: kdebindings-qyoto-includes.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: akonadi-devel >= 1.1.0
-BuildRequires: plasma-devel >= %{version}
+BuildRequires: kdebase-workspace-devel >= %{version}
# okular bindings
BuildRequires: kdegraphics-devel >= %{version}
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
-%{?falcon:BuildRequires: Falcon-devel >= 0.8.12}
-%{?csharp:BuildRequires: mono-core}
BuildRequires: python-devel
-%{?ruby:BuildRequires: ruby-devel ruby}
-BuildRequires: PyQt4-devel >= %{pyqt4_version}
+BuildRequires: PyQt4-devel >= %{pyqt4_version}
%if 0%{?fedora} > 8
BuildRequires: qscintilla-devel >= 2.2
%endif
BuildRequires: soprano-devel
+%if 0%{?csharp}
+BuildRequires: mono-core
+BuildRequires: mono-devel
+%endif
+%if 0%{?falcon}
+BuildRequires: Falcon-devel >= 0.8.12
+%endif
+%if 0%{?php}
+BuildRequires: php-devel
+%endif
+%if 0%{?ruby}
+BuildRequires: ruby-devel
+BuildRequires: ruby
+%endif
+%if 0%{?java}
+# TODO: kross-java is a mess, not sure what it needs to build
+# CMakeLists.txt is also not portable (only gcj and i486 hardcoded)
+# -- mathstuf
+BuildRequires: java-1.6.0-openjdk-devel
+%endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4 >= %{version}
-%{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
+%if ! 0%{?devel}
+Obsoletes: kdebindings-devel < %{version}-%{release}
+%endif
%description
KDE bindings to non-C++ languages
@@ -95,6 +117,33 @@
%description devel
Header files for developing applications using %{name}.
+%if 0%{?csharp}
+%package -n kimono
+Group: Development/Languages
+Summary: C# bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: qyoto = %{version}-%{release}
+Provides: kimono4 = %{version}-%{release}
+%description -n kimono
+%{summary}.
+
+%package -n qyoto
+Group: Development/Languages
+Summary: C# bindings for Qt4
+Requires: qt4 >= %{_qt4_version}
+Provides: qyoto4 = %{version}-%{release}
+%description -n qyoto
+%{summary}.
+
+%package -n qyoto-devel
+Group: Development/Languages
+Summary: Development files for qyoto
+Requires: qyoto = %{version}-%{release}
+Provides: qyoto4-devel = %{version}-%{release}
+%description -n qyoto-devel
+%{summary}.
+%endif
+
%if 0%{?ruby}
%package -n korundum
Group: Development/Languages
@@ -107,7 +156,7 @@
%package -n korundum-devel
Group: Development/Languages
-Summary: Development files for korundum
+Summary: Development files for korundum
Requires: QtRuby-devel
Requires: korundum = %{version}-%{release}
Provides: korundum4-devel = %{version}-%{release}
@@ -124,13 +173,31 @@
%package -n QtRuby-devel
Group: Development/Languages
-Summary: Development files for QtRuby
+Summary: Development files for QtRuby
Requires: QtRuby = %{version}-%{release}
Provides: QtRuby4-devel = %{version}-%{release}
%description -n QtRuby-devel
%{summary}.
%endif
+%if 0%{?php}
+%package -n php-qt
+Group: Development/Languages
+Summary: PHP bindings for Qt4
+Requires: qt4 >= %{_qt4_version}
+Provides: php-qt4 = %{version}-%{release}
+%description -n php-qt
+%{summary}.
+
+%package -n php-qt-devel
+Group: Development/Languages
+Summary: Development files for php-qt
+Requires: php-qt = %{version}-%{release}
+Provides: php-qt4-devel = %{version}-%{release}
+%description -n php-qt-devel
+%{summary}.
+%endif
+
%package -n kross-python
Group: Development/Languages
Summary: Kross plugin for python
@@ -139,6 +206,7 @@
%description -n kross-python
Python plugin for the Kross archtecture in KDE4.
+%if 0%{?ruby}
%package -n kross-ruby
Group: Development/Languages
Summary: Kross plugin for ruby
@@ -147,7 +215,9 @@
Provides: kross(ruby) = %{version}-%{release}
%description -n kross-ruby
Ruby plugin for the Kross archtecture in KDE4.
+%endif
+%if 0%{?falcon}
%package -n kross-falcon
Group: Development/Languages
Summary: Kross plugin for falcon
@@ -156,28 +226,56 @@
Provides: kross(falcon) = %{version}-%{release}
%description -n kross-falcon
Falcon plugin for the Kross archtecture in KDE4.
+%endif
%prep
%setup -q
+%patch0
+%patch99
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-# FIXME/TODO: Get csharp to compile
%{cmake_kde4} \
- %{!?csharp:-DBUILD_csharp=OFF} \
- %{?falcon:-DBUILD_falcon=ON -DENABLE_KROSSFALCON=ON} \
- %{!?php:-DBUILD_php=OFF} \
- %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
- %{!?smoke:-DBUILD_smoke=OFF} \
+ %if 0%{?csharp}
+ -DENABLE_QYOTO=ON \
+ %else
+ -DBUILD_csharp=OFF \
+ %endif
+ %if 0%{?falcon}
+ -DENABLE_KROSSFALCON=ON \
+ %else
+ -DBUILD_falcon=OFF \
+ %endif
+ %if 0%{?php}
+ -DENABLE_PHP-QT=ON \
+ %else
+ -DBUILD_php=OFF \
+ %endif
+ %if 0%{?ruby}
+ -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} \
+ -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \
+ %else
+ -DBUILD_ruby=OFF \
+ %endif
+ %if 0%{?smoke}
+ -DENABLE_SMOKE=ON \
+ %else
+ -DBUILD_smoke=OFF \
+ %endif
+ %if 0%{?java}
+ -DENABLE_KROSSJAVA=ON \
+ %else
+ -DBUILD_java=OFF \
+ %endif
..
popd
# smp build not recommended (upstream)
make -C %{_target_platform}
-
%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
@@ -229,6 +327,63 @@
%{_kde4_appsdir}/pykde4/examples/
%{_kde4_datadir}/sip/PyKDE4/
+%if 0%{?csharp}
+%files -n kimono
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kimonopluginfactory.so
+%{_kde4_libdir}/libakonadi-sharp.so
+%{_kde4_libdir}/libkhtml-sharp.so
+%{_kde4_libdir}/libkimono.so
+%{_kde4_libdir}/libktexteditor-sharp.so
+%{_kde4_libdir}/libnepomuk-sharp.so
+%{_kde4_libdir}/libplasma-sharp.so
+%{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/mono/2.0/akonadi.dll
+%{_kde4_libdir}/mono/2.0/kde-dotnet.dll
+%{_kde4_libdir}/mono/2.0/khtml-dll.dll
+%{_kde4_libdir}/mono/2.0/ktexteditor-dotnet.dll
+%{_kde4_libdir}/mono/2.0/nepomuk-dll.dll
+%{_kde4_libdir}/mono/2.0/plasma-dll.dll
+%{_kde4_libdir}/mono/2.0/soprano.dll
+%{_kde4_libdir}/mono/gac/akonadi/
+%{_kde4_libdir}/mono/gac/kde-dotnet/
+%{_kde4_libdir}/mono/gac/khtml-dll/
+%{_kde4_libdir}/mono/gac/ktexteditor-dotnet/
+%{_kde4_libdir}/mono/gac/nepomuk-dll/
+%{_kde4_libdir}/mono/gac/plasma-dll/
+%{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_appsdir}/plasma_scriptengine_kimono/
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
+
+%files -n qyoto
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libqtscript-sharp.so
+%{_kde4_libdir}/libqttest-sharp.so
+%{_kde4_libdir}/libqtuitools-sharp.so
+%{_kde4_libdir}/libqtwebkit-sharp.so
+%{_kde4_libdir}/libqyoto.so
+%{_kde4_libdir}/libqyotoshared.so.1
+%{_kde4_libdir}/libqyotoshared.so.1.0.0
+%{_kde4_libdir}/mono/2.0/qt-dotnet.dll
+%{_kde4_libdir}/mono/2.0/qtscript.dll
+%{_kde4_libdir}/mono/2.0/qttest.dll
+%{_kde4_libdir}/mono/2.0/qtuitools.dll
+%{_kde4_libdir}/mono/2.0/qtwebkit.dll
+%{_kde4_libdir}/mono/gac/qt-dotnet/
+%{_kde4_libdir}/mono/gac/qtscript/
+%{_kde4_libdir}/mono/gac/qttest/
+%{_kde4_libdir}/mono/gac/qtuitools/
+%{_kde4_libdir}/mono/gac/qtwebkit/
+
+%files -n qyoto-devel
+%defattr(-,root,root,-)
+%{_bindir}/csrcc
+%{_bindir}/uics
+%{_includedir}/qyoto/
+%{_kde4_libdir}/libqyotoshared.so
+%endif
+
%if 0%{?ruby}
%files -n korundum
%defattr(-,root,root,-)
@@ -280,6 +435,16 @@
%{_kde4_libdir}/libqtruby4shared.so
%endif
+%if 0%{?php}
+%files -n php-qt
+%defattr(-,root,root,-)
+%{_libdir}/php/modules/php_qt.so
+
+%files -n php-qt-devel
+%defattr(-,root,root,-)
+%{_bindir}/phpuic
+%endif
+
%files -n kross-python
%defattr(-,root,root,-)
# unversioned library
@@ -299,7 +464,11 @@
%changelog
-* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org. - 4.2.1-2
+* Fri Mar 20 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-3
+- Clean up conditionals
+- Enable PHP and C# bindings
+
+* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
- fix typos in Provides: kross(python)
* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
More information about the fedora-extras-commits
mailing list