From 740ccfce35b3309b8da89ab2faf2a2c7df473107 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sat, 16 Nov 2002 20:52:39 +0000
Subject: new version

---
 gnome-extra/gtkhtml/ChangeLog                      |   6 +-
 gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4     |   1 -
 gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6     |   1 +
 .../gtkhtml/files/gtkhtml-properties.c.diff        | 122 ------------------
 gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild           | 138 ---------------------
 gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild           | 138 +++++++++++++++++++++
 6 files changed, 144 insertions(+), 262 deletions(-)
 delete mode 100644 gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4
 create mode 100644 gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6
 delete mode 100644 gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff
 delete mode 100644 gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild
 create mode 100644 gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild

(limited to 'gnome-extra/gtkhtml')

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 3c74dc4f3b24..2aa82828d2b3 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.8 2002/09/28 07:35:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.9 2002/11/16 20:52:39 azarah Exp $
+
+*gtkhtml-1.1.6 (16 Nov 2002)
+  16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
 
 *gtkhtml-1.1.2 (28 Sep 2002)
   28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4
deleted file mode 100644
index 5dc37c59a58d..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc03437091b6cfd84f4de76a02e48f41 gtkhtml-1.1.4.tar.bz2 1090236
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6
new file mode 100644
index 000000000000..fe32c0a4ad62
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6
@@ -0,0 +1 @@
+MD5 4b4e0098653a50e61d3b713ddb7f81d6 gtkhtml-1.1.6.tar.bz2 1077593
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff b/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff
deleted file mode 100644
index 31a1c394a318..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff
+++ /dev/null
@@ -1,122 +0,0 @@
---- gtkhtml-properties.c.orig	Fri Nov  9 01:15:55 2001
-+++ gtkhtml-properties.c	Tue Nov 20 23:59:29 2001
-@@ -181,59 +181,6 @@
-         g_free (p->v); \
-         GET(string,v,s)
- 
--static gchar *
--get_font_name (const GdkFont * font)
--{
--	Atom font_atom, atom;
--	Bool status;
--
--	font_atom = gdk_atom_intern ("FONT", FALSE);
--
--	if (font->type == GDK_FONT_FONTSET) {
--		XFontStruct **font_structs;
--		gint num_fonts;
--		gchar **font_names;
--
--		num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names);
--		status = XGetFontProperty (font_structs[0], font_atom, &atom);
--	} else {
--		status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom);
--	}
--
--	if (status) {
--		return gdk_atom_name (atom);
--	}
--
--	return NULL;
--}
--
--static void
--get_default_fonts (gchar **var_name, gchar **fix_name)
--{
--	GtkStyle *style;
--	char *font_name = NULL;
--
--	style = gtk_widget_get_default_style ();
--	if (style->font) {
--		font_name = get_font_name (style->font);
--	}
--
--	if (font_name) {
--		gchar *enc1, *enc2;
--
--		enc1 = html_font_manager_get_attr (font_name, 13);
--		enc2 = html_font_manager_get_attr (font_name, 14);
--
--		*var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2);
--		*fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2);
--
--		/* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */
--	} else {
--		*var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*");
--		*fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*");
--	}
--}
--
- void
- gtk_html_class_properties_load (GtkHTMLClassProperties *p)
- {
-@@ -319,6 +266,59 @@
- 	gnome_config_sync ();
- }
- #endif
-+
-+static gchar *
-+get_font_name (const GdkFont * font)
-+{
-+	Atom font_atom, atom;
-+	Bool status;
-+
-+	font_atom = gdk_atom_intern ("FONT", FALSE);
-+
-+	if (font->type == GDK_FONT_FONTSET) {
-+		XFontStruct **font_structs;
-+		gint num_fonts;
-+		gchar **font_names;
-+
-+		num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names);
-+		status = XGetFontProperty (font_structs[0], font_atom, &atom);
-+	} else {
-+		status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom);
-+	}
-+
-+	if (status) {
-+		return gdk_atom_name (atom);
-+	}
-+
-+	return NULL;
-+}
-+
-+static void
-+get_default_fonts (gchar **var_name, gchar **fix_name)
-+{
-+	GtkStyle *style;
-+	char *font_name = NULL;
-+
-+	style = gtk_widget_get_default_style ();
-+	if (style->font) {
-+		font_name = get_font_name (style->font);
-+	}
-+
-+	if (font_name) {
-+		gchar *enc1, *enc2;
-+
-+		enc1 = html_font_manager_get_attr (font_name, 13);
-+		enc2 = html_font_manager_get_attr (font_name, 14);
-+
-+		*var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2);
-+		*fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2);
-+
-+		/* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */
-+	} else {
-+		*var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*");
-+		*fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*");
-+	}
-+}
- 
- #define COPYS(v) \
-         g_free (p1->v); \
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild
deleted file mode 100644
index cca07471d578..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild,v 1.1 2002/11/09 12:43:22 azarah Exp $
-
-IUSE="nls gnome"
-
-inherit gnome.org libtool
-
-MY_PV="`echo ${PV} | cut -d. -f1,2`"
-S="${WORKDIR}/${P}"
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine."
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-# This one lets gtkhtml-1.0 compiled stuff work, but some stuff do
-# not compile, so not sure as to what to set SLOT to .. it could be
-# that new versions will support 1.[12] of gtkhtml ...
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
-
-RDEPEND=">=gnome-extra/gal-0.20
-	<gnome-base/control-center-1.99.0
-	>=gnome-base/libghttp-1.0.9-r1
-	>=dev-libs/libunicode-0.4-r1
-	>=gnome-base/gnome-print-0.34
-	>=gnome-base/bonobo-1.0.20
-	gnome? ( <gnome-base/gconf-1.1.0 )
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )
-	<gnome-base/libglade-0.99.0"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	# Evo users need to have bonobo support
-	#use bonobo \
-	#	&& myconf="${myconf} --with-bonobo" \
-	#	|| myconf="${myconf} --without-bonobo"
-
-	use gnome \
-		&& myconf="${myconf} --with-gconf" \
-		|| myconf="${myconf} --without-gconf"
-
-  	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-
-  	emake || die "Package building failed."
-}
-
-# This function converts a pkgconfig config type file to
-# a Conf.sh type file used by gnome-config.
-#
-#   Usage:  conv_pkgconfig_confsh foo.pc
-#
-# <azarah@gentoo.org> (9 Nov 2002)
-conv_pkgconfig_confsh() {
-
-	local pkgconfig_file="$1"
-	local confsh_file="${pkgconfig_file%%-*}Conf.sh"
-	local package_name="`echo ${pkgconfig_file%%-*} | awk '{print toupper($0)}'`"
-	local tmpfile="${T}/$$.env"
-
-	[ "$#" -ne 1 ] && return 1
-	[ ! -f ${D}/usr/lib/pkgconfig/${pkgconfig_file} ] && return 1
-
-	# Remove bogus info and convert to bash type file we can
-	# source ...
-	sed -e 's|: *|=|g' \
-		-e '/^$/ d' \
-		-e 's|$|"|g' \
-		-e 's|=|="|g' \
-		-e 's|Libs=|libs=|' \
-		-e 's|Cflags=|cflags=|' \
-		-e '/^Name.*/ d' \
-		-e '/^Description.*/ d' \
-		-e '/^Version.*/ d' \
-		${D}/usr/lib/pkgconfig/${pkgconfig_file} > ${tmpfile}
-
-	source ${tmpfile}
-
-	# Ok, generate our Conf.sh file
-    cat > ${D}/usr/lib/${confsh_file} <<CONFSHEND
-#
-# Configuration file for using the ${package_name} library in GNOME applications
-#
-${package_name}_LIBDIR="-L${libdir}"
-${package_name}_LIBS="${libs}"
-${package_name}_INCLUDEDIR="${cflags}"
-${package_name}_DATADIR="${gtkhtml_datadir}"
-MODULE_VERSION="${module_version}"
-
-CONFSHEND
-
-	# Fix permissions
-	fperms 0755 /usr/lib/${confsh_file}
-}
-
-src_install() {
-	local fullname=""
-	
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		install || die
-
-	# Fix the double entry in Control Center
-	rm -f ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop
-
-	# This next big gets gtkhtml-1.1 to be compadible with gtkhtml-1.0.
-	# We basically generate a /usr/lib/gtkhtmlConf.sh so that gnome-config
-	# will see gtkhtml-1.1 and other older gnome apps should then be able
-	# to use it.  We also create libgtkhtml.so and libgtkhtml.so.20 symlinks,
-	# and /usr/share/gtkhtml-1.1/gtkhtml symlinks for apps compiled against
-	# older gtkhtml to find their libs, and data .idl files.
-	#
-	# <azarah@gentoo.org> (9 Nov 2002)
-	conv_pkgconfig_confsh ${PN}-${MY_PV}.pc
-
-	# Add some type of backward compat for libs...
-	fullname="`eval basename \`readlink ${D}/usr/lib/lib${PN}-${MY_PV}.so\``"
-	dosym ${fullname##*/} /usr/lib/lib${PN}.so
-	dosym ${fullname##*/} /usr/lib/lib${PN}.so.20
-
-	# For older apps to be able to find the data...
-	dosym '.' /usr/share/${PN}-${MY_PV}/${PN}
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-}
-
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild
new file mode 100644
index 000000000000..8f2baee7f84f
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild,v 1.1 2002/11/16 20:52:39 azarah Exp $
+
+IUSE="nls gnome"
+
+inherit gnome.org libtool
+
+MY_PV="`echo ${PV} | cut -d. -f1,2`"
+S="${WORKDIR}/${P}"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine."
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+# This one lets gtkhtml-1.0 compiled stuff work, but some stuff do
+# not compile, so not sure as to what to set SLOT to .. it could be
+# that new versions will support 1.[12] of gtkhtml ...
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+
+RDEPEND=">=gnome-extra/gal-0.20
+	<gnome-base/control-center-1.99.0
+	>=gnome-base/libghttp-1.0.9-r1
+	>=dev-libs/libunicode-0.4-r1
+	>=gnome-base/gnome-print-0.34
+	>=gnome-base/bonobo-1.0.20
+	gnome? ( <gnome-base/gconf-1.1.0 )
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )
+	<gnome-base/libglade-0.99.0"
+
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+	use nls || myconf="${myconf} --disable-nls"
+
+	# Evo users need to have bonobo support
+	#use bonobo \
+	#	&& myconf="${myconf} --with-bonobo" \
+	#	|| myconf="${myconf} --without-bonobo"
+
+	use gnome \
+		&& myconf="${myconf} --with-gconf" \
+		|| myconf="${myconf} --without-gconf"
+
+  	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		${myconf} || die
+
+  	emake || die "Package building failed."
+}
+
+# This function converts a pkgconfig config type file to
+# a Conf.sh type file used by gnome-config.
+#
+#   Usage:  conv_pkgconfig_confsh foo.pc
+#
+# <azarah@gentoo.org> (9 Nov 2002)
+conv_pkgconfig_confsh() {
+
+	local pkgconfig_file="$1"
+	local confsh_file="${pkgconfig_file%%-*}Conf.sh"
+	local package_name="`echo ${pkgconfig_file%%-*} | awk '{print toupper($0)}'`"
+	local tmpfile="${T}/$$.env"
+
+	[ "$#" -ne 1 ] && return 1
+	[ ! -f ${D}/usr/lib/pkgconfig/${pkgconfig_file} ] && return 1
+
+	# Remove bogus info and convert to bash type file we can
+	# source ...
+	sed -e 's|: *|=|g' \
+		-e '/^$/ d' \
+		-e 's|$|"|g' \
+		-e 's|=|="|g' \
+		-e 's|Libs=|libs=|' \
+		-e 's|Cflags=|cflags=|' \
+		-e '/^Name.*/ d' \
+		-e '/^Description.*/ d' \
+		-e '/^Version.*/ d' \
+		${D}/usr/lib/pkgconfig/${pkgconfig_file} > ${tmpfile}
+
+	source ${tmpfile}
+
+	# Ok, generate our Conf.sh file
+    cat > ${D}/usr/lib/${confsh_file} <<CONFSHEND
+#
+# Configuration file for using the ${package_name} library in GNOME applications
+#
+${package_name}_LIBDIR="-L${libdir}"
+${package_name}_LIBS="${libs}"
+${package_name}_INCLUDEDIR="${cflags}"
+${package_name}_DATADIR="${gtkhtml_datadir}"
+MODULE_VERSION="${module_version}"
+
+CONFSHEND
+
+	# Fix permissions
+	fperms 0755 /usr/lib/${confsh_file}
+}
+
+src_install() {
+	local fullname=""
+	
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/lib \
+		install || die
+
+	# Fix the double entry in Control Center
+	rm -f ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop
+
+	# This next big gets gtkhtml-1.1 to be compadible with gtkhtml-1.0.
+	# We basically generate a /usr/lib/gtkhtmlConf.sh so that gnome-config
+	# will see gtkhtml-1.1 and other older gnome apps should then be able
+	# to use it.  We also create libgtkhtml.so and libgtkhtml.so.20 symlinks,
+	# and /usr/share/gtkhtml-1.1/gtkhtml symlinks for apps compiled against
+	# older gtkhtml to find their libs, and data .idl files.
+	#
+	# <azarah@gentoo.org> (9 Nov 2002)
+	conv_pkgconfig_confsh ${PN}-${MY_PV}.pc
+
+	# Add some type of backward compat for libs...
+	fullname="`eval basename \`readlink ${D}/usr/lib/lib${PN}-${MY_PV}.so\``"
+	dosym ${fullname##*/} /usr/lib/lib${PN}.so
+	dosym ${fullname##*/} /usr/lib/lib${PN}.so.20
+
+	# For older apps to be able to find the data...
+	dosym '.' /usr/share/${PN}-${MY_PV}/${PN}
+
+	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
+}
+
-- 
cgit v1.2.3-65-gdbad