1 |
tampakrap 11/02/03 10:27:44 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
kdebindings-ruby-4.6.0.ebuild |
5 |
Log: |
6 |
Fix build, it was searching for smoke headers in wrong locations. Also, fix the declarative automagic. bug 353538 |
7 |
|
8 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.8 kde-base/kdebindings-ruby/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/metadata.xml?rev=1.8&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/metadata.xml?rev=1.8&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/metadata.xml?r1=1.7&r2=1.8 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/metadata.xml,v |
20 |
retrieving revision 1.7 |
21 |
retrieving revision 1.8 |
22 |
diff -u -r1.7 -r1.8 |
23 |
--- metadata.xml 26 Jan 2011 20:29:08 -0000 1.7 |
24 |
+++ metadata.xml 3 Feb 2011 10:27:44 -0000 1.8 |
25 |
@@ -4,6 +4,7 @@ |
26 |
<herd>kde</herd> |
27 |
<use> |
28 |
<flag name="akonadi">Compile bindings for Akonadi.</flag> |
29 |
+ <flag name="declarative">Compile bindings for <pkg>x11-libs/qt-declarative</pkg>.</flag> |
30 |
<flag name="kate">Compile bindings for KDE Advanced Text Editor.</flag> |
31 |
<flag name="okular">Compile bindings for <pkg>kde-base/okular</pkg>.</flag> |
32 |
<flag name="phonon">Compile bindings for Phonon.</flag> |
33 |
|
34 |
|
35 |
|
36 |
1.30 kde-base/kdebindings-ruby/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog?rev=1.30&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog?rev=1.30&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog?r1=1.29&r2=1.30 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v |
45 |
retrieving revision 1.29 |
46 |
retrieving revision 1.30 |
47 |
diff -u -r1.29 -r1.30 |
48 |
--- ChangeLog 30 Jan 2011 13:09:48 -0000 1.29 |
49 |
+++ ChangeLog 3 Feb 2011 10:27:44 -0000 1.30 |
50 |
@@ -1,6 +1,11 @@ |
51 |
# ChangeLog for kde-base/kdebindings-ruby |
52 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.29 2011/01/30 13:09:48 tampakrap Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.30 2011/02/03 10:27:44 tampakrap Exp $ |
55 |
+ |
56 |
+ 03 Feb 2011; Theo Chatzimichos <tampakrap@g.o> |
57 |
+ kdebindings-ruby-4.6.0.ebuild: |
58 |
+ Fix build, it was searching for smoke headers in wrong locations. Also, fix |
59 |
+ the declarative automagic. bug 353538 |
60 |
|
61 |
30 Jan 2011; Theo Chatzimichos <tampakrap@g.o> |
62 |
kdebindings-ruby-4.4.5.ebuild, kdebindings-ruby-4.5.5.ebuild, |
63 |
|
64 |
|
65 |
|
66 |
1.3 kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild?rev=1.3&view=markup |
69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild?rev=1.3&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild?r1=1.2&r2=1.3 |
71 |
|
72 |
Index: kdebindings-ruby-4.6.0.ebuild |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild,v |
75 |
retrieving revision 1.2 |
76 |
retrieving revision 1.3 |
77 |
diff -u -r1.2 -r1.3 |
78 |
--- kdebindings-ruby-4.6.0.ebuild 30 Jan 2011 13:09:48 -0000 1.2 |
79 |
+++ kdebindings-ruby-4.6.0.ebuild 3 Feb 2011 10:27:44 -0000 1.3 |
80 |
@@ -1,6 +1,6 @@ |
81 |
# Copyright 1999-2011 Gentoo Foundation |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild,v 1.2 2011/01/30 13:09:48 tampakrap Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild,v 1.3 2011/02/03 10:27:44 tampakrap Exp $ |
85 |
|
86 |
EAPI=3 |
87 |
|
88 |
@@ -19,11 +19,11 @@ |
89 |
|
90 |
DESCRIPTION="KDE Ruby bindings" |
91 |
KEYWORDS="~amd64 ~ppc ~x86" |
92 |
-IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop" |
93 |
+IUSE="akonadi debug declarative kate okular phonon plasma qscintilla qwt semantic-desktop" |
94 |
|
95 |
# TODO add qt-declarative |
96 |
DEPEND=" |
97 |
- $(add_kdebase_dep smoke 'akonadi?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?') |
98 |
+ $(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?') |
99 |
" |
100 |
|
101 |
ruby_add_bdepend dev-ruby/rubygems |
102 |
@@ -59,6 +59,32 @@ |
103 |
ruby/qtruby/src/qtruby.cpp \ |
104 |
ruby/qtruby/src/qtruby.h \ |
105 |
ruby/qtruby/src/smokeruby.h || die |
106 |
+ |
107 |
+ sed -i -e "s#include <smoke/qt/#include <smoke/#" -e "s#include <smoke/kde/#include <smoke/#" \ |
108 |
+ ruby/qtruby/src/Qt.cpp \ |
109 |
+ ruby/qtruby/src/marshall_types.cpp \ |
110 |
+ ruby/qtruby/modules/phonon/phonon.cpp \ |
111 |
+ ruby/qtruby/modules/qtdeclarative/qtdeclarative.cpp \ |
112 |
+ ruby/qtruby/modules/qtuitools/qtuitools.cpp \ |
113 |
+ ruby/qtruby/modules/qtscript/qtscript.cpp \ |
114 |
+ ruby/qtruby/modules/qwt/qwt.cpp \ |
115 |
+ ruby/qtruby/modules/qttest/qttest.cpp \ |
116 |
+ ruby/qtruby/modules/qtwebkit/qtwebkit.cpp \ |
117 |
+ ruby/qtruby/src/qtruby.cpp \ |
118 |
+ ruby/korundum/src/Korundum.cpp \ |
119 |
+ ruby/korundum/modules/soprano/soprano.cpp \ |
120 |
+ ruby/korundum/modules/akonadi/akonadi.cpp \ |
121 |
+ ruby/korundum/modules/khtml/khtml.cpp \ |
122 |
+ ruby/korundum/modules/kio/kio.cpp \ |
123 |
+ ruby/korundum/modules/ktexteditor/ktexteditor.cpp \ |
124 |
+ ruby/korundum/modules/solid/solid.cpp \ |
125 |
+ ruby/korundum/modules/nepomuk/nepomuk.cpp \ |
126 |
+ ruby/korundum/modules/plasma/src/plasma.cpp \ |
127 |
+ ruby/korundum/modules/plasma/src/plasmahandlers.cpp \ |
128 |
+ ruby/korundum/modules/nepomuk/nepomukhandlers.cpp || die |
129 |
+ |
130 |
+ echo 'target_link_libraries(rubyqtdeclarative ${QT_QTDECLARATIVE_LIBRARY})' >> \ |
131 |
+ ruby/qtruby/modules/qtdeclarative/CMakeLists.txt || die |
132 |
} |
133 |
|
134 |
each_ruby_configure() { |
135 |
@@ -69,6 +95,7 @@ |
136 |
-DRUBY_EXECUTABLE=${RUBY} |
137 |
$(cmake-utils_use_with akonadi) |
138 |
$(cmake-utils_use_with akonadi KdepimLibs) |
139 |
+ $(cmake-utils_use_disable declarative QtDeclarative) |
140 |
$(cmake-utils_use_disable kate) |
141 |
$(cmake-utils_use_with okular) |
142 |
$(cmake-utils_use_with phonon) |