severity 643738 serious
thanks

Hi,

The GNOME 3 transition is now starting and libgucharmap2 will soon be
unavailable.

I plan to nmu stardict during the weekend, applying the following patch to
disable the gucharmap plugin. As I know you're active and have worked on
stardict very recently, it'd be better if you could do a maintainer
upload, if you wish.

Thanks!

Jordi
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jo...@sindominio.net     jo...@debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/
diff -Nuar stardict-3.0.1/debian/changelog ./debian/changelog
--- stardict-3.0.1/debian/changelog	2011-09-28 09:21:30.000000000 +0200
+++ ./debian/changelog	2011-10-13 19:54:11.250449363 +0200
@@ -1,3 +1,14 @@
+stardict (3.0.1-9.1) unstable; urgency=low
+
+  * Non-maintainer upload, for the GNOME 3 transition.
+  * Disable the gucharmap plugin until stardict is ported to GTK+3.0, as
+    the GTK+ 2.0 version of libgucharmap is no longer supported and mixing
+    GTK+ 2 and 3 in the same process is not allowed (closes: #643738):
+    - drop Build-Depends on libgucharmap2-dev
+    - pass --disable-gucharmap to configure
+
+ -- Jordi Mallach <jo...@debian.org>  Thu, 13 Oct 2011 19:51:28 +0200
+
 stardict (3.0.1-9) unstable; urgency=low
 
   * Drop ttf-thryomanes from Suggests: package ttf-thryomanes has been
diff -Nuar stardict-3.0.1/debian/control ./debian/control
--- stardict-3.0.1/debian/control	2011-09-28 09:21:07.000000000 +0200
+++ ./debian/control	2011-10-13 19:58:45.186449741 +0200
@@ -6,7 +6,7 @@
 Build-Depends:
  debhelper (>= 8), autoconf, automake (>= 1.10), autotools-dev, intltool,
  libbonobo2-dev, libenchant-dev, libespeak-dev, libestools2.0-dev,
- libgconf2-dev, libgnomeui-dev, libgucharmap2-dev, liborbit2-dev,
+ libgconf2-dev, libgnomeui-dev, liborbit2-dev,
  libsigc++-2.0-dev (>= 2.0.18-2), libtool, libx11-dev, libxml-parser-perl,
  festival-dev, rarian-compat, sharutils, x11proto-core-dev, zlib1g-dev
 Build-Conflicts: autoconf2.13, automake1.4
@@ -33,8 +33,7 @@
 Recommends:
  stardict-plugin (= ${binary:Version}),
  stardict-plugin-espeak (= ${binary:Version}),
- stardict-plugin-festival (= ${binary:Version}),
- stardict-plugin-gucharmap (= ${binary:Version})
+ stardict-plugin-festival (= ${binary:Version})
 Suggests: ttf-freefont, ttf-arphic-uming
 Replaces: stardict-gtk
 Conflicts: stardict-gtk
@@ -99,20 +98,6 @@
  This package contains Festival TTS plugin for StarDict which can
  pronounce words.
 
-Package: stardict-plugin-gucharmap
-Architecture: any
-Depends:
- ${misc:Depends}, ${shlibs:Depends}, stardict-common (= ${source:Version}),
- stardict-gnome (= ${binary:Version}) | stardict-gtk (= ${binary:Version}),
- stardict-plugin (= ${binary:Version})
-Description: International dictionary - gucharmap plugin
- StarDict is a cross-platform and international written in GTK+ 2.x.
- It has powerful features such as "Glob-style pattern matching",
- "Scan selection word", "Fuzzy search", etc.
- .
- This package contains gucharmap plugin for StarDict which can help
- you examine Unicode character's detailed properties.
-
 Package: stardict-plugin-spell
 Architecture: any
 Depends:
diff -Nuar stardict-3.0.1/debian/patches/06_new_gucharmap.patch ./debian/patches/06_new_gucharmap.patch
--- stardict-3.0.1/debian/patches/06_new_gucharmap.patch	2010-07-27 17:19:42.000000000 +0200
+++ ./debian/patches/06_new_gucharmap.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Author: Steve Kowalik <stev...@ubuntu.com>
-Description: Correct pkg-config name for gucharmap, and correct some code changes
-with the new version of the library.
---- a/configure.in
-+++ b/configure.in
-@@ -76,7 +76,7 @@
- 	[enable_gucharmap=yes])
- 
- if test "x$enable_gucharmap" = "xyes" ; then
--	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
-+	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
- 	if test "x$have_gucharmap" = "xyes"; then
- 		GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}"
- 		GUCHARMAP_LIBS="${GUCHARMAP_LIBS}"
---- a/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
-+++ b/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
-@@ -237,7 +237,7 @@
- 	/* canonical decomposition */
- 	gunichar *decomposition;
- 	gsize result_len;
--	decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len);
-+	decomposition = g_unicode_canonical_decomposition (uc, &result_len);
- 	if (result_len != 1) {
- 		definition += _("Canonical decomposition:");
- 		definition += " ";
diff -Nuar stardict-3.0.1/debian/patches/series ./debian/patches/series
--- stardict-3.0.1/debian/patches/series	2011-09-15 13:01:39.000000000 +0200
+++ ./debian/patches/series	2011-10-13 19:59:42.746449802 +0200
@@ -3,7 +3,6 @@
 03_license-updates.patch
 04_changelog-minor-typo-fixes.patch
 05_g++-4.4.patch
-06_new_gucharmap.patch
 07_disable_netdict.patch
 08_gcc-4.6.patch
 09_fix_ftbfs_binutils_gold.patch
diff -Nuar stardict-3.0.1/debian/rules ./debian/rules
--- stardict-3.0.1/debian/rules	2011-09-22 09:23:30.000000000 +0200
+++ ./debian/rules	2011-10-13 19:57:27.470449492 +0200
@@ -24,6 +24,7 @@
 	dh_auto_configure -- \
 		--disable-schemas-install \
 		--disable-advertisement \
+		--disable-gucharmap \
 		--disable-updateinfo
 	$(MAKE)
 
diff -Nuar stardict-3.0.1/debian/stardict-plugin-gucharmap.install ./debian/stardict-plugin-gucharmap.install
--- stardict-3.0.1/debian/stardict-plugin-gucharmap.install	2011-09-22 09:23:30.000000000 +0200
+++ ./debian/stardict-plugin-gucharmap.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/stardict/plugins/stardict_gucharmap.so

Attachment: signature.asc
Description: Digital signature

Reply via email to