Merge pull request #175 from ayhanyalcinsoy/master

gtk3 and scim fixed dep

desktop/toolkit/gtk/gtk3/actions.py

@@ -17,7 +17,6 @@ def setup():
                --disable-silent-rules \
                --disable-schemas-compile \
                --enable-introspection \
-               --enable-gtk2-dependency \
                --disable-papi \
                --disable-wayland-backend \
               "
@@ -59,3 +58,4 @@ def install():
         for binaries in ["gtk-query-immodules-3.0"]:
             pisitools.domove("/_emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
         pisitools.removeDir("/_emul32")
+    pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache")

desktop/toolkit/gtk/gtk3/pspec.xml

@@ -52,9 +52,9 @@
             <Dependency>cups</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>libXi</Dependency>
-            <Dependency>json-glib</Dependency>
+            <!--<Dependency>json-glib</Dependency>-->
             <Dependency>cairo</Dependency>
-            <Dependency>gobject-introspection</Dependency>
+            <!--<Dependency>gobject-introspection</Dependency>-->
             <Dependency>libXext</Dependency>
             <Dependency>libXrandr</Dependency>
             <Dependency>libXfixes</Dependency>
@@ -124,8 +124,10 @@
             <Dependency release="current">gtk3</Dependency>
             <Dependency>atk-devel</Dependency>
             <Dependency>pango-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
             <Dependency>libXi-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
             <Dependency>libepoxy-devel</Dependency>
             <Dependency>libXfixes-devel</Dependency>

x11/im/scim/actions.py

@@ -25,7 +25,6 @@ def setup():
                         ")
                          #--disable-panel-gtk \
                          #--disable-setup-ui")
-                         # no gtk3 support in scim-anthy
 
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 

x11/im/scim/pspec.xml

@@ -18,7 +18,6 @@
             <AdditionalFile permission="0644" target="configs/global">scim-system-global</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-            <Dependency>gtk2-devel</Dependency>
             <Dependency>gtk3-devel</Dependency>
             <Dependency>libXt-devel</Dependency>
             <Dependency>intltool</Dependency>
@@ -41,6 +40,11 @@
         <RuntimeDependencies>
             <Dependency>libX11</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>scim-libs</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -60,7 +64,11 @@
         <Name>scim-libs</Name>
         <Summary>Libraries of SCIM</Summary>
         <RuntimeDependencies>
+            <Dependency>pango</Dependency>
             <Dependency>libX11</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libtool-ltdl</Dependency>
         </RuntimeDependencies>
@@ -84,33 +92,13 @@
         </Files>
     </Package>
 
-    <Package>
-        <Name>scim-immodule-gtk2</Name>
-        <Summary>IM Module for GTK2 applications</Summary>
-        <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
-            <Dependency>atk</Dependency>
-            <Dependency>gtk2</Dependency>
-            <Dependency>cairo</Dependency>
-            <Dependency>pango</Dependency>
-            <Dependency>fontconfig</Dependency>
-            <Dependency>gdk-pixbuf</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib/gtk-2.0</Path>
-        </Files>
-    </Package>
-
     <Package>
         <Name>scim-immodule-gtk3</Name>
         <Summary>IM Module for GTK3 applications</Summary>
         <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
-            <Dependency>atk</Dependency>
             <Dependency>gtk3</Dependency>
-            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
-            <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/gtk-3.0</Path>
@@ -118,14 +106,15 @@
     </Package>
 
     <Package>
-        <Name>scim-immodule-qt5</Name>
+        <Name>scim-immodule-gtk2</Name>
-        <Summary>IM Module for Qt5 applications</Summary>
+        <Summary>IM Module for GTK2 applications</Summary>
         <RuntimeDependencies>
-            <Dependency>scim-libs</Dependency>
+            <Dependency>gtk2</Dependency>
-            <Dependency>qt</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>pango</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/qt4/plugins/inputmethods/im-scim.so</Path>
+            <Path fileType="library">/usr/lib/gtk-2.0</Path>
         </Files>
     </Package>