From 1c54a68b7d79d7aa5e0bd39644532cf897c2bd2e Mon Sep 17 00:00:00 2001
From: Sukneet Basuta
Date: Thu, 21 Jun 2012 17:00:55 -0400
Subject: scim: => 1.4.13 * DEPENDS: Changed optional_Depends scim-tables to 
 suggest_depends.            Changed depends gtk+2 to optional_depends.       
     Added optional_depends gtk+3

* BUILD:   added, force gtk+2 UI for now since gtk+3 does not seem to
           compile. Check if this is still valid on next update.

* PRE_BUILD, scim_glibc-2.10.patch: removed, no longer needed
---
 i18n/scim/BUILD                 |  4 ++++
 i18n/scim/DEPENDS               | 12 ++++++++----
 i18n/scim/DETAILS               |  4 ++--
 i18n/scim/HISTORY               |  9 +++++++++
 i18n/scim/PRE_BUILD             |  3 ---
 i18n/scim/scim_glibc-2.10.patch | 12 ------------
 6 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100755 i18n/scim/BUILD
 delete mode 100755 i18n/scim/PRE_BUILD
 delete mode 100644 i18n/scim/scim_glibc-2.10.patch

(limited to 'i18n')

diff --git a/i18n/scim/BUILD b/i18n/scim/BUILD
new file mode 100755
index 0000000000..4a8645e7fc
--- /dev/null
+++ b/i18n/scim/BUILD
@@ -0,0 +1,4 @@
+# Force gtk+2 for now since gtk+3 UI does not seem to compile
+OPTS="$OPTS --with-gtk-version=2" &&
+
+default_build
diff --git a/i18n/scim/DEPENDS b/i18n/scim/DEPENDS
index 64548c29cf..8523bfa0a1 100755
--- a/i18n/scim/DEPENDS
+++ b/i18n/scim/DEPENDS
@@ -3,11 +3,10 @@ depends  cairo        &&
 depends  expat        &&
 depends  fontconfig   &&
 depends  freetype2    &&
-depends -sub CXX gcc          &&
+depends -sub CXX gcc  &&
 depends  gcc          &&
 depends  glib2        &&
 depends  glitz        &&
-depends  gtk+2        &&
 depends  libpng       &&
 depends  libx11       &&
 depends  libxau       &&
@@ -22,5 +21,10 @@ depends  libxrender   &&
 depends  pango        &&
 depends  zlib         &&
 
-# convert to suggested_depends once available
-optional_depends scim-tables "" "" "for one of the input methods"
+optional_depends gtk+2 "" "--disable-gtk2-immodule" "For GTK2 IMModule" &&
+
+optional_depends gtk+3 "" "--disable-gtk3-immodule" "For GTK3 IMModule" &&
+
+optional_depends doxygen "" "--without-doxygen" "For API documentation" &&
+
+suggest_depends scim-tables "" "" "for one of the input methods"
diff --git a/i18n/scim/DETAILS b/i18n/scim/DETAILS
index d9243c5a52..2860a0ef2a 100755
--- a/i18n/scim/DETAILS
+++ b/i18n/scim/DETAILS
@@ -1,10 +1,10 @@
            SPELL=scim
-         VERSION=1.4.9
+         VERSION=1.4.13
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.scim-im.org/
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:5b8239e4274dbb896d48d4411012d755ee903f885092edd9943168e535fb78b23c7bc832f22bde1fe6ff715a55a5e2779baea9f1ac9e68257576301541906761
+     SOURCE_HASH=sha512:f0a2142959bd4ccd0e2bf57f4dbe7e51d1dd9ed5b2d09f5e1f493bfe6510d8d40bd6e237054f7a3b1f713b248d0f49dab3db0f8db34586abab00829bf283c34a
       LICENSE[0]=GPL
          ENTERED=20030912
         KEYWORDS="i18n"
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index 3d145d09b1..09db9874b8 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,12 @@
+2012-06-21 Sukneet Basuta <sukneet@sourcemage.org>
+	* DETAILS: Spell updated to 1.4.13
+	* DEPENDS: Changed optional_Depends scim-tables to  suggest_depends.
+	  Changed depends gtk+2 to optional_depends.
+	  Added optional_depends gtk+3
+	* BUILD: added, force gtk+2 UI for now since gtk+3 does not seem to
+	  compile. Check if this is still valid on next update.
+	* PRE_BUILD, scim_glibc-2.10.patch: removed, no longer needed
+
 2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/i18n/scim/PRE_BUILD b/i18n/scim/PRE_BUILD
deleted file mode 100755
index d6f80ac0f5..0000000000
--- a/i18n/scim/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/scim_glibc-2.10.patch
diff --git a/i18n/scim/scim_glibc-2.10.patch b/i18n/scim/scim_glibc-2.10.patch
deleted file mode 100644
index 52213aacdb..0000000000
--- a/i18n/scim/scim_glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur scim-1.4.9.orig/src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
---- scim-1.4.9.orig/src/ltdl.cpp	2008-11-02 07:42:40.000000000 +0100
-+++ scim-1.4.9/src/ltdl.cpp	2010-08-11 08:46:27.000000000 +0200
-@@ -3361,7 +3361,7 @@
- {
-   lt_dlhandle	handle		= 0;
-   char *	tmp		= 0;
--  char *	ext		= 0;
-+  const char *	ext		= 0;
-   size_t	len;
-   int		errors		= 0;
- 
-- 
cgit v1.2.3